* further reverts of accidental changes and improve Hardware code
* continuing to revert that deletion
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 presets