Minor fixing after Pulling
Merge branch 'dev' of https://github.com/alexYer/TempCannon into dev
Merge remote-tracking branch 'origin/NikitaSmall' into dev

Conflicts resolved:
	AndroidManifest.xml
Merge remote-tracking branch 'origin/dev' into NikitaSmall