hotel commit
testing commit
Merge branch 'master' of https://github.com/yangml/hotel.git

Conflicts:
	src/com/integration/action/admin/AdminServiceAction.java