Removed changelog (the issue was invalidated, and opened new issue to fix this problem)
Merge branch 'issue_251' into issue_253
Fix comments
This tile will not have the option to be editable into compor tab
Merge branch 'issue_253' into issue_255

Conflicts:
	docs/CHANGES.rst