PH: More work towards ActivityAddEdit + Persisting User's last known location.
Merge branch 'master' of https://github.com/RShankar/Empower-App-WhatsUp-Fall-2014 into master-dup

Conflicts:
	Source/app/src/main/java/com/group2/whatsup/MapScreen.java
PH: More logic toward EventAddEdit, also added in the immediae persistence, regardless whether or not you're actually at a location yet on GPS