* use constants from actionbarsherlock in actionbar spinner
Merge commit '2084797c3d22f60ddbdd21d2eaf9f94096f0fdb8'
+ Presets can be selected from menu
Merge branch 'gps'
* bugfix
+ added prototype pedestrian preset
* fix with items not being checked
Merge branch 'presets'

Conflicts:
	src/devedroid/opensurveyor/ButtonUIFragment.java
* fix bad merge
* fix to make Session more serializable
* Session can be serialized by introducing replacement for android's
Location
same
* further polish actionbar spinner
* tweak actionbar spinner
Merge branch 'master' into gps