solve conflict
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
tab.js
Merge branch 'develop'

Conflicts:
	mynewtemplate/index.php
Merge branch 'master' of https://github.com/MINMINNCU/templates

Conflicts:
	mynewtemplate/index.php
index.php 衝突修正最終版
Merge branch 'develop'
[slidemenu] 不會一重整就跳出
search result popup
Merge branch 'master' into develop