Android UI branch
Booking UI - basic layout done
fixed previous commit errors
UI progress
adding changes to leDeviceList RE: occupied
sync
sync
sync
fixed scanning, scanning only occours on button press now
Updated Android UI
sync
sync
Fully functional UI
Merge branch 'ui'

Conflicts:
	android-client/AllDemosActivity/bin/AllDemosActivity.apk
	android-client/AllDemosActivity/bin/classes.dex
	android-client/AllDemosActivity/bin/classes/com/estimote/examples/demos/LeDeviceListAdapter$HttpAsyncTask.class
	android-client/AllDemosActivity/bin/classes/com/estimote/examples/demos/LeDeviceListAdapter$ViewHolder.class
	android-client/AllDemosActivity/bin/classes/com/estimote/examples/demos/LeDeviceListAdapter.class
	android-client/AllDemosActivity/bin/classes/com/estimote/examples/demos/ListBeaconsActivity$1$1.class
	android-client/AllDemosActivity/bin/classes/com/estimote/examples/demos/ListBeaconsActivity$1.class
	android-client/AllDemosActivity/bin/classes/com/estimote/examples/demos/ListBeaconsActivity$2.class
	android-client/AllDemosActivity/bin/classes/com/estimote/examples/demos/ListBeaconsActivity$3.class
	android-client/AllDemosActivity/bin/classes/com/estimote/examples/demos/ListBeaconsActivity.class
	android-client/AllDemosActivity/bin/classes/com/estimote/examples/demos/R$id.class
	android-client/AllDemosActivity/bin/dexedLibs/estimote-sdk-preview-08dc7a362d1b3a528c5bf19f1db27257.jar
	android-client/AllDemosActivity/bin/resources.ap_
	android-client/AllDemosActivity/gen/com/estimote/examples/demos/R.java
	android-client/AllDemosActivity/res/layout/device_item.xml
	android-client/AllDemosActivity/res/layout/main.xml
	android-client/AllDemosActivity/res/menu/scan_menu.xml
	android-client/AllDemosActivity/src/com/estimote/examples/demos/LeDeviceListAdapter.java
	android-client/AllDemosActivity/src/com/estimote/examples/demos/ListBeaconsActivity.java
	data-server/bookings.json
sync update
Delete .merge_file_a06880
Delete .merge_file_a12124
Delete .merge_file_a14028
Delete .merge_file_a16644
Delete .merge_file_a21548