Added sharkpulse icon as default icon
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.
Check if image is taken from camera or gallery. If taken from camera, check if GPS is on, and then send coordinates to FormActivity to an uneditable edit text.
Merge branch 'master' of github.com:dcarrot2/sharkpulse_android

Conflicts:
	app/src/main/java/edu/stanford/baseline/sharkpulse/FormActivity.java
	app/src/main/java/edu/stanford/baseline/sharkpulse/StartActivity.java