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

Conflicts:
	Application/Runtime/Cache/Home/1223f42a89e823bf89547594651162de.php
	Application/Runtime/Logs/Home/14_12_30.log