Remove import of FloatMath
Merge remote-tracking branch 'origin/working_fix_keys' into working_gui
Add zoom/pan control
Home page design
Add zoom/pan control
Merge remote-tracking branch 'origin/working_fix_keys'

Conflicts:
	gen/fr/utbm/calibrationapp/R.java
	res/layout/activity_welcome.xml
	res/values/color.xml
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
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
Add custom ListItem for Floors

- Add model object Floor
- Add FloorListAdapter
- Add floor_lits_item
Merge remote-tracking branch 'origin/working_gui'
Check IP address and port number
Add AlertDialog for a new Building