Merge origin/master

Conflicts:
	web/admin/administration.xhtml