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

Conflicts:
	app/src/main/java/pt/menuguru/menuguru/MyActivity.java