Merge branch 'development' into Jeroen
Merge branch 'development' into Jeroen
more translations
Merge branch 'development' into Jeroen

Conflicts:
	js/languages.js
Merge branch 'development' into Jeroen
createpage translations
Merge branch 'Jeroen' into development

Conflicts:
	common/institute.inc.php