hotel commit
Merge branch 'master' into hotel
ok
Merge branch 'master' of https://github.com/minhtucs/SmartTravelClient
ok
Merge branch 'master' into tourist_place
deleted gen and bin folder and .classpath file
Merge branch 'master' of https://github.com/minhtucs/SmartTravelClient
deleted redundant files
tourist place map
add action search icon
delete bin, gen folder
Merge branch 'tourist_place'
Merge branch 'hotel'
Merge branch 'master' into restaurant/move-search-view-to-actionbar
implement detail hotel (Map, Overview)
Merge pull request #1 from minhtucs/hotel

implement detail hotel (Map, Overview)
Merge branch 'master' into restaurant/move-search-view-to-actionbar
add resources for actionbars
resolved conflicted