fix comment and item delete
Merge branch 'master' of https://github.com/tsuwatch/ma9

Conflicts:
	edison/public/js/app.min.js