fixed some issues
Merge branch 'master' of https://github.com/bartolkaruza/capo

Conflicts:
	LightSpace/app/src/main/java/com/philips/lighting/quickstart/GameActivity.java
Merge branch 'master' of https://github.com/bartolkaruza/capo