administration
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/templates-hidden/default.html
administration
basicpage