Merge branch 'thy' into dev
修复了部分bug，但为此删除了一些功能，后期再进行重写
Merge branch 'thy' into dev
Merge branch 'dev' of github.com:JYWa/teamstyle16 into dev

Conflicts:
	application/views/forum/thread.php
merge thy
Merge branch 'dev' into thy
throw all session into models