Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/release/output-metadata.json
#	app/version_code.properties

diff --cc app/src/main/java/com/ic/temperature/viewmodel/TemperatureViewModel.kt
Simple merge