Finish task #TASK-045.
Merge branch 'master' of https://github.com/stoner30/canditu

Conflicts:
	cmapweb/src/main/java/com/fc/cmapweb/web/IndexCtrl.java
	cmapweb/src/main/webapp/WEB-INF/pages/common/header.jsp
	cmapweb/src/main/webapp/WEB-INF/pages/index.jsp