cancel help animation gracefully if camera view is touched
Merge branch 'master' of https://github.com/numixproject/org.numixproject.croma

Conflicts:
	app/src/main/java/org/numixproject/croma/ColorPickerActivity.java