added RoomInfo.html
Merge branch 'master' of https://github.com/aumd/TravelCompanion

Conflicts:
	assets/www/Hotelview.html
	bin/TravelCompanion.apk
	bin/resources.ap_