Working on inviting additional friends
Merge branch 'master' of https://github.com/TheHubMobileApp/TheHub

Conflicts:
	app/src/main/res/layout/hangout_activity.xml