Add GPS data, correctly close activity
Merge branch 'new_master' into camera