update
merged from siscia
error management updated
updates
almost done
removed id option
Merge http://github.com/gianbaoluo/HotelRevolution2014s
only one big bug to get rid of
update
Merge http://github.com/ZanSara/HotelRevolution2014s
update
update
update
confirm updated
booking function works
fix merge
Merge branch 'ZanSara-master'