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

Conflicts:
	Application/Admin/View/index/index.html
	Application/Runtime/Logs/Admin/14_12_24.log