submit
Merge branch 'master' of https://github.com/AAATEAM/hotel

Conflicts:
	hotel-minsu/src/main/resources/database-${online}.properties
alert information