增加酒店详细页面的基本布局
Merge branch 'hotdetail_20130111_1658'

Conflicts:
	guoli/res/drawable/shape_round_rect_grey.xml