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

Conflicts:
	Application/Runtime/Logs/Home/14_12_29.log
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Admin/Runtime/Cache/Home/804b7cf88273dd2fecb7afc145611b9d.php
	Admin/Runtime/Cache/Home/cc981a9e5c21c8e2d43b2a9367330c6a.php
	Application/Runtime/Cache/Home/8ed741b6da9e3cf0b06484dfb6809ef8.php
	Application/Runtime/Logs/Home/14_12_29.log