- egit nodiff glitch?
Merge branch 'master' into FTR-24-ENHANCED-COMMENTS

Conflicts:
	edelphi/src/main/webapp/_themes/default/css/forms.css