second commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc-manager-app/src/main/java/com/docmanager/controller/UserController.java
	doc-manager-app/src/main/webapp/WEB-INF/applicationContext.xml
	doc-manager-app/src/main/webapp/WEB-INF/pages/home/index.jsp
	doc-manager-app/src/main/webapp/WEB-INF/views/user/list.jsp
	doc-manager-pom/pom.xml
Old pages converted for bootstrap and i18n
Merge remote-tracking branch 'origin/master'