1
Merge branch 'master' of https://github.com/xxxx1997/bbs

Conflicts:
	Application/Runtime/Cache/Index/0fa547d45531922e8e75f8944444c53d.php
	Application/Runtime/Logs/Index/14_12_17.log
	Application/Runtime/Logs/Index/14_12_18.log
xxx
Merge branch 'master' of https://github.com/xxxx1997/bbs

Conflicts:
	Application/Runtime/Cache/Home/0713803e655fc5ad814d5ad63c8dbfc9.php
	Application/Runtime/Logs/Home/14_12_18.log