asdsd
Merge branch 'master' of github.com:123jian/bbs

Conflicts:
	Application/Runtime/Cache/Admin/6ac3d104dc49392a20a38e84057ab49d.php
	Application/Runtime/Logs/Admin/14_12_24.log
	Application/Runtime/Logs/Home/14_12_24.log