some cleanup and fixing breaking bug introduced by merge
Merge branch 'master' of github.com:designcreateplay/NodeBB