broken
Merge branch 'master' of https://github.com/EugeneK-BY/GitRepository

Conflicts:
	hotel-proj-1/src/main/webapp/WEB-INF/spring/webmvc-config.xml

	hotel-proj-1/target/m2e-wtp/web-resources/META-INF/maven/com.eugene.hotelproj/hotel-proj-1/pom.properties
after fucked up
user registration page