Fixing #362 Wrong site link send in mail when changing/creating webuser
Merge branch 'master' into develop
Transalias fixes

Conflicts:
	assets/plugins/transalias/transalias.class.php
	install/assets/plugins/transalias.tpl