license inclusion
Merge branch 'master' of github.com:LearnZillion-Org/inBloom-ThermoMeter
minor changes to alerts controller
Merge branch 'master' of github.com:LearnZillion-Org/inBloom-ThermoMeter