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

Conflicts:
	.gitignore
	android/gen/ua/pp/willowapps/catchhue/android/BuildConfig.java