Bastantes alterações no restaurante
Merge branch 'master' of https://github.com/Hugogoodpeople/Menuguru

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

Menuguru6/libraries/facebook/build/intermediates/incremental/mergeResour
ces/release/merger.xml

Menuguru6/libraries/facebook/build/intermediates/incremental/packageReso
urces/release/merger.xml
	Menuguru6/libraries/facebook/build/outputs/aar/facebook.aar
correcções de manifest
Merge branch 'master' of https://github.com/Hugogoodpeople/Menuguru

Conflicts:
	Menuguru6/app/src/main/AndroidManifest.xml
	Menuguru6/app/src/main/res/layout/activity_pesquisa_avancada.xml
	Menuguru6/app/src/main/res/layout/activitylogin.xml
	Menuguru6/app/src/main/res/layout/header_restaurante_main.xml
	Menuguru6/app/src/main/res/values/styles.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/release/classes
.jar
	Menuguru6/libraries/facebook/build/outputs/aar/facebook.aar