Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/jsp/components/ContactsComponent.jsp
	src/main/webapp/WEB-INF/jsp/infopoi.jsp
Merge origin/master