0526
0528
Merge branch 'master' of https://github.com/idreamsoft/iCMS

Conflicts:
	trunk/app/article/article.app.php
	trunk/app/comment/comment.app.php
	trunk/app/comment/comment.tpl.php