Merge remote-tracking branch 'origin/working_fix_keys' into working_gui
Add zoom/pan control
Merge remote-tracking branch 'origin/master' into working_gui
ActionBar changes
Add custom ListItem for Buildings

Add model object Building
Add ListViewAdapter
Add custom ListItem
Merge remote-tracking branch 'origin/working_keys' into working_gui

Conflicts:
	AndroidManifest.xml
Merge remote-tracking branch 'origin/working_gui'

Conflicts:
	AndroidManifest.xml