trying to revert
Revert "null pointer came from not getting gps locations from GPS provider"

This reverts commit 79f4b86c822bfc64e4f5e6c957104ebd6ad6d701.
Revert "nothing changed"

This reverts commit 3a5099e595f8541ac94c42571ec63224100cb92e.
merge
Merge branch 'master' into NavjeetsBranch

Conflicts:
	GPSCommentLogger/src/com/CMPUT301W14T13/gpscommentlogger/controller/CreateSubmissionActivity.java
implemented Mapping a thread, done button causes crash
Fixed parent activity in manifest
Merge with NavjeetsBranch