routes y
sql
Merge branch 'master' of https://github.com/hunglk/shop

Conflicts:
	.htaccess
	application/frontend/config/routes.php