Merge origin/master

Conflicts:
	src/conf/persistence.xml
	web/resources/css/base.css