Merge origin/master

Conflicts:
	AAP-FREE-WIKI/web/template/template.xhtml