something to make createcircleactivity work
Merge remote-tracking branch 'origin/master'

Conflicts:

	ParseStarterProject/bin/classes/com/parse/starter/CreateCircleActivity.class
Merge branch 'master' of https://github.com/Zenspiration/sucCesspool