fixes
Merge branch 'master' of https://github.com/BritehouseMobile/Atajo_Android

Conflicts:
	KMFS/assets/www/bootloader.js
	KMFS/bin/KonicaMinolta.apk
trying