1
Merge branch 'master' of https://github.com/zhaolun/mybbs
add
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Admin/Runtime/Logs/Home/14_12_18.log
	Application/Runtime/Cache/Home/9d459e48cece1d7473e65af45d1fe54a.php
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Admin/Runtime/Logs/Home/14_12_18.log
add
1
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Admin/Runtime/Logs/Home/14_12_18.log
	Application/Runtime/Logs/Home/14_12_18.log