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

Conflicts:
	Application/Admin/View/index/index.html
	Application/Runtime/Cache/Admin/0b52b973c175c071400c16d055a6997e.php
	Application/Runtime/Cache/Admin/195664513c892f1c459bd68c120b70a2.php
	Application/Runtime/Cache/Admin/3f32a74e5f38caf10a744601a2614eea.php
	Application/Runtime/Cache/Admin/b595b808c2ebeeeb0478ffc30bb4e87a.php
	Application/Runtime/Logs/Admin/14_12_24.log
	Application/Runtime/Logs/Home/14_12_24.log
12