bug fixes

Fixed Crashing
Merge branch 'master' of https://github.com/CookieMaster/CookieMasterFlashLight

Conflicts:
	.idea/misc.xml
	app/app-release.apk
	app/src/main/AndroidManifest.xml