Edit
Merge branch 'master' of git@github.com:Bridea/kais.git

Conflicts:
	src/main/webapp/staff/akademik/includes/main/edit.xhtml