Merge branch 'master' of /home/thilini/Development/SITH/Sith with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	NodeApi/mongoAdapter.js
Merge remote-tracking branch 'origin/master'
Comment box issue fixed