commit
Merge branch 'master' of https://github.com/jonathantyates/gather

Conflicts:
	android/Gather/.idea/copyright/profiles_settings.xml
	android/Gather/.idea/misc.xml
	android/Gather/.idea/modules.xml
	android/Gather/Gather.iml