Added string res, fixed variable names, added instance of AppController on FormActivity.
Added alert dialog when gps is disabled. Moved imageView from StartActivity to FormActivity
Added AppController instance to FormActivity to complete record of picture. Still need to fix image path when user takes picture
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