more strange changes
Merge branch 'master' of github.com:willowapps/catchhue

Conflicts:
	android/AndroidManifest.xml
Merge branch 'master' of github.com:willowapps/catchhue