- update
Merge branch 'master' of https://github.com/crazykook/emag_aul

Conflicts:
	platform/android/game/AndroidManifest.xml