fininsh uncommon
Merge branch 'master' of https://github.com/MINMINNCU/templates into feature/uncommon_itemRank

Conflicts:
	mynewtemplate/html/com_k2/default/category.php
	mynewtemplate/html/com_k2/default/item.php
	mynewtemplate/index.php
	mynewtemplate/javascripts/custom.js
Merge branch 'feature/uncommon_itemRank'