commit
Merge branch 'master' of https://github.com/Hugogoodpeople/Menuguru

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