CCommit tab Quotation 修正
Merge branch 'master' of https://github.com/MINMINNCU/templates

Conflicts:
	mynewtemplate/css/main.css
	mynewtemplate/html/com_k2/default/category.php
	mynewtemplate/index.php
Merge branch 'master' of https://github.com/MINMINNCU/templates

Conflicts:
	mynewtemplate/index.php