Comment function (untested)
Comment Management Ready
Add Bug and List of bug Ready
Bug Management Ready
Merge branch 'dev'

Conflicts:
	core/client/app/js/app.js
Fix merge problem