On/Off almost working....
Merge branch 'master' of https://github.com/AlmaKnudson/Senior-Project-Team-Prism

Conflicts:
	Android/PhilipsHueSDK-Android/.idea/workspace.xml

Android/PrismLights/app/src/main/java/app/lights/prism/com/prismlights/M
ainActivity.java
	Android/PrismLights/app/src/main/res/layout/fragment_music.xml