ui
Merge branch 'master' of https://github.com/lsr90518/ValdacConstruction

Conflicts:
	.gitignore
	.idea/vcs.xml
	pom.xml
	src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml