sample android app
Fixed JSON formatting issue
Small server naming fixes
Android client functionality
occupied , unoccupied images , ui
modifed booking page
added date/timepickers to booking page
removed duplicate files
add ios-client and server script
fixed booking array name
Android UI branch
Delete .DS_Store

dont know what is it
update ios client
beacon data in list, colours
change leBeacon to check rooms
Booking UI - basic layout done
fixed previous commit errors
code cleanup
Merge branch 'master' of https://github.com/LaGref/room-proximity
UI progress