added comment display feature to editor
Merge branch 'master' of https://github.com/dkleine/project-m

Conflicts:
	easyticket.php