Principios de webservice
mais um
Merge branch 'master' of https://github.com/Hugogoodpeople/Menuguru

Conflicts:
	Menuguru6/app/src/main/java/pt/menuguru/menuguru6/Inicio.java

Menuguru6/facebook/build/intermediates/bundles/debug/res/drawable/com_fa
cebook_picker_list_selector_background_transition.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/drawable/com_fa
cebook_picker_top_button.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/drawable/com_fa
cebook_top_background.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/drawable/com_fa
cebook_top_button.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/drawable/com_fa
cebook_usersettingsfragment_background_gradient.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/layout/com_face
book_friendpickerfragment.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/layout/com_face
book_login_activity_layout.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/layout/com_face
book_picker_activity_circle_row.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/layout/com_face
book_picker_checkbox.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/layout/com_face
book_picker_image.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/layout/com_face
book_picker_list_row.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/layout/com_face
book_picker_list_section_header.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/layout/com_face
book_picker_search_box.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/layout/com_face
book_picker_title_bar.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/layout/com_face
book_picker_title_bar_stub.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/layout/com_face
book_placepickerfragment.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/layout/com_face
book_placepickerfragment_list_row.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/layout/com_face
book_search_bar_layout.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/layout/com_face
book_tooltip_bubble.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/layout/com_face
book_usersettingsfragment.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/values-es/value
s.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/values-hdpi-v4/
values.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/values-he/value
s.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/values-iw/value
s.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/values-ldpi-v4/
values.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/values-mdpi-v4/
values.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/values-xhdpi-v4
/values.xml

Menuguru6/facebook/build/intermediates/bundles/debug/res/values/values.x
ml

Menuguru6/facebook/build/intermediates/incremental/mergeAssets/debug/mer
ger.xml

Menuguru6/facebook/build/intermediates/incremental/packageResources/debu
g/merger.xml