Starting GPS
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/utexas/steve/connexus/CameraActivity.java
	app/src/main/java/com/utexas/steve/connexus/UploadActivity.java
	app/src/main/java/com/utexas/steve/connexus/ViewAllActivity.java