Merge branch 'master' of git@github.com:mrtuvn/WRU_CSE.git

Conflicts:
	fixthread.php
	js/fix-chat.js