minor
Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/rootconfig.xml