dd
d
d
d
d
d
d
d
d
d
d
d
d
d
d
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.tomcatplugin
	src/resources/META-INF/persistence.xml
	src/resources/import.sql
	web/WEB-INF/applicationContext.xml
	web/WEB-INF/web.xml
	web/applications/dashboard/dashboard.html
	web/applications/home/controller.js
	web/applications/home/home.html
	web/applications/home/theme.css