Add space if required before inserting delimited text slugs (resolves
OE-2937)
[OE-3157] - Fixed layout of sticky header
Merge branch 'release/1.4' of github.com:openeyes/OpenEyes into release/1.4
Fixed broken variable assignment (id instead of object)
+ comments header
+ bugfixes for contacts
[OE-3154] don't show the firm/site selection reminder if the user has global_firm_rights
Merge branch 'release/1.4' of github.com:openeyes/OpenEyes into release/1.4
PSR2 compliance changes
Merge branch 'release/1.4' of ssh://github.com/openeyes/OpenEyes into release/1.4
Merge branch 'release/1.4' of ssh://github.com/openeyes/OpenEyes into release/1.4
bugfixes related to contacts system
Merge branch 'release/1.4' of github.com:openeyes/OpenEyes into release/1.4

Conflicts:
	protected/behaviors/ContactBehavior.php
	protected/models/ContactLocation.php
PSR2 compliance changes
Merge branch 'release/1.4' of ssh://github.com/openeyes/OpenEyes into release/1.4
+ first steps of commissioning body models
Merge branch 'release/1.4' into develop
Reverted main style file to use old styles
Merged from develop