Added hash helper
Merge branch 'master' of https://github.com/Z-Home/capstone

Conflicts:
	Android/ZHOME/.idea/workspace.xml
	Android/ZHOME/app/build/generated/source/r/debug/com/miz/pdb/R.java
	Android/ZHOME/app/build/intermediates/classes/debug/com/miz/pdb/R$drawable.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/miz/pdb/R$id.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/miz/pdb/R$layout.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/miz/pdb/R$menu.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/miz/pdb/R$string.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/miz/pdb/R$style.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/miz/pdb/R.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/pdb/zhome/DrawerItemCustomAdapter.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/pdb/zhome/FavoritesFragment.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/pdb/zhome/LightsScreen.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/pdb/zhome/LoginActivity.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/pdb/zhome/MainActivity.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/pdb/zhome/RoomsFragment.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/pdb/zhome/ScenariosFragment.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/pdb/zhome/SummaryFragment.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/pdb/zhome/TestFragment.class
	Android/ZHOME/app/build/intermediates/classes/debug/com/pdb/zhome/roomsCustomAdapter.class
	Android/ZHOME/app/build/intermediates/dex/debug/classes.dex
	Android/ZHOME/app/build/intermediates/incremental/mergeResources/debug/merger.xml
	Android/ZHOME/app/build/intermediates/libs/app-debug.ap_
	Android/ZHOME/app/build/intermediates/manifests/debug/AndroidManifest.xml
	Android/ZHOME/app/build/intermediates/res/debug/drawable-hdpi-v4/lights.png
	Android/ZHOME/app/build/intermediates/res/debug/drawable-hdpi-v4/outlets.png
	Android/ZHOME/app/build/intermediates/res/debug/drawable-hdpi-v4/security.png
	Android/ZHOME/app/build/intermediates/res/debug/drawable-hdpi-v4/sensors.png
	Android/ZHOME/app/build/intermediates/res/debug/drawable-hdpi-v4/thermostat.png
	Android/ZHOME/app/build/intermediates/res/debug/layout/activity_login.xml
	Android/ZHOME/app/build/intermediates/res/debug/layout/fragment_scenarios.xml
	Android/ZHOME/app/build/intermediates/res/debug/layout/fragment_summary.xml
	Android/ZHOME/app/build/outputs/apk/app-debug-unaligned.apk
	Android/ZHOME/app/src/main/java/com/pdb/zhome/LightsScreen.java
	Android/ZHOME/app/src/main/java/com/pdb/zhome/SummaryFragment.java
	Android/ZHOME/app/src/main/res/layout/thermostat_list_screen.xml