rick update
Merge branch 'develop' of https://github.com/Rick1206/kelly into develop

Conflicts:
	admin/Lib/Action/BannerAction.class.php
	admin/Lib/Action/CommentsAction.class.php
	admin/Lib/Action/DownloadsAction.class.php
	admin/Lib/Action/NewsAction.class.php
	admin/Lib/Action/WorkAction.class.php
	admin/Runtime/Logs/13_03_26.log