Before pull to fix Facebook loop
Merge branch 'master' of https://github.com/mwong56/angelhack2014

Conflicts:
	src/com/android/upick/models/PlannedEvent.java