fix issue #55
Merge branch 'master' of https://github.com/withitergroup/quhao

Conflicts:
	modules/quhao.appserver/app/com/withiter/models/account/Reservation.java