changes in
- main organisation page (and ets)
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/extensions/widgets/STbBox.php