binh
Merge branch 'master' of https://github.com/masterit92/ShopFlowers

Conflicts:
	application/default/views/index/index.php
	application/default/views/products/detailPro.php
	public/templates/default/css/content_css.css
	public/templates/default/index.php
binh comit