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

Conflicts:
	Menuguru6/libraries/facebook/build/outputs/aar/facebook.aar
Facebook