# Conflicts:
#	src/main/resources/application.properties
#	src/main/resources/public/common/css/all.css
#	src/main/resources/public/common/css/bootstrap-combined.min.css
#	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/layout1.html