Merge branch 'master' of https://github.com/anil-ninja/teamroom

Conflicts:
	ninjas.php

left panel and ch open article stmt font cganged
Merge branch 'master' of https://github.com/anil-ninja/teamroom