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

Conflicts:
	Application/Index/View/layout.html
	Application/Runtime/Cache/Home/0fab4701a0102614083ef431e0ae069a.php
	Application/Runtime/Cache/Home/c506a66e5fd5c20a850e05056283aa1e.php
	Application/Runtime/Cache/Index/23cbddec21f2bc3f4e27327c50ea8084.php
	Application/Runtime/Cache/Index/43a7f67cebcef76b29c8ceee468992c0.php
	Application/Runtime/Cache/Index/5f343310d4a83e1c2f6d4e5a6181e90a.php
	Application/Runtime/Logs/Home/14_12_23.log
	Application/Runtime/Logs/Home/14_12_24.log
	Application/Runtime/Logs/Index/14_12_23.log
	Application/Runtime/Logs/Index/14_12_24.log
Merge branch 'master' of https://github.com/xxxx1997/bbs

Conflicts:
	Application/Index/View/layout.html
	Application/Runtime/Cache/Index/5f343310d4a83e1c2f6d4e5a6181e90a.php
	Application/Runtime/Logs/Index/14_12_25.log