some changes to comment engine
mergin with changes done directly on server. Sorry about this.

Merge branch 'master' of https://github.com/thestaceface/Humbeer