Added alert dialog when gps is disabled. Moved imageView from StartActivity to FormActivity
Merge branch 'master' of github.com:dcarrot2/sharkpulse_android
Added alert dialog to formactivity if Provider is disabled
Conflicts:
	app/src/main/java/edu/stanford/baseline/sharkpulse/AppController.java
	app/src/main/java/edu/stanford/baseline/sharkpulse/FormActivity.java
	app/src/main/java/edu/stanford/baseline/sharkpulse/StartActivity.java
	app/src/main/res/layout/activity_start.xml
fixed image path when picture is taken, added alert dialog to turn on GPS if is off. Moved imageView to FormActivity to display the picture th user took.
Merge branch 'master' of github.com:dcarrot2/sharkpulse_android

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/edu/stanford/baseline/sharkpulse/AppController.java
	app/src/main/java/edu/stanford/baseline/sharkpulse/FormActivity.java
Merge pull request #2 from briandeanda/master

GPS implementation with an AlertDialog, send information through email intent, various bug fixes
Merge remote-tracking branch 'upstream/master'
Lowered API level to 10. Fixed activity_start.xml so that buttons wouldn't be crowded against each other.