hgghhghg
Merge branch 'master' of https://github.com/veidekke/awe13

Conflicts:
	AMI_Project/app/src/main/AndroidManifest.xml