fix for role handling
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/tools/BalticTools.js