Made it work!!!
Merge branch 'origin/mongodbInstalled' into development

Conflicts:
	vakpom-portlet/src/main/java/vakpom/controller/PersonController.java
	vakpom-portlet/src/main/webapp/WEB-INF/web.xml
	vakpom-portlet/src/main/webapp/view.jsp