test
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/morningintern/TC_SHOP

Conflicts:
	README.md
	data/Smarty/templates_c/admin/%%13^132^132AFCF1%%subnavi.tpl.php
	data/Smarty/templates_c/admin/%%18^186^18690E6D%%subnavi.tpl.php
	data/Smarty/templates_c/admin/%%32^320^32085AAD%%subnavi.tpl.php
	data/Smarty/templates_c/admin/%%33^334^334B0C92%%subnavi.tpl.php
	data/Smarty/templates_c/admin/%%55^558^55894E38%%subnavi.tpl.php
	data/Smarty/templates_c/admin/%%86^864^8644F0D6%%home.tpl.php
	data/Smarty/templates_c/admin/%%B3^B3A^B3A1B470%%subnavi.tpl.php
	data/Smarty/templates_c/admin/%%B7^B7E^B7E43223%%main_frame.tpl.php
	data/Smarty/templates_c/admin/%%BA^BA2^BA261E81%%subnavi.tpl.php
	data/Smarty/templates_c/admin/%%BA^BA6^BA672246%%subnavi.tpl.php
	data/Smarty/templates_c/admin/%%CA^CAD^CADD4501%%subnavi.tpl.php
	data/Smarty/templates_c/admin/%%ED^ED3^ED38FFEE%%subnavi.tpl.php