# Conflicts:
#	pom.xml
#	src/main/resources/application.properties
#	src/main/resources/public/index.html
#	src/main/resources/public/js/angular-resource.js
#	src/main/resources/public/js/app.js
#	src/main/resources/public/layout/layout2.html
#	src/main/resources/public/layout/layout3.html