xiaov edit
刘晓威后台2014-7-11
Merge branch 'master' of github.com:henuo/henuo.com

Conflicts:
	Manage/Lib/Action/CategoryAction.class.php
	Manage/Tpl/Layout/arch.html
	config.inc.php
	imgallery.xml

Signed-off-by: henuo <chauvetliu@163.com>
Merge branch 'master' of github.com:henuo/henuo.com

Conflicts:
	config.inc.php
Merge branch 'master' of github.com:henuo/henuo.com

Conflicts:
	Home/Lib/Action/CategoryAction.class.php
	Manage/Tpl/Layout/nav_left.html
	division_of_work.md
刘晓威完成和诺人
Merge branch 'master' of github.com:henuo/henuo.com

Conflicts:
	Home/Lib/Action/CategoryAction.class.php
	Home/Lib/Action/IndexAction.class.php
	config.inc.php
Merge branch 'master' of github.com:henuo/henuo.com
和诺人修改