update
Merge branch 'master' of https://github.com/appletoeat2/health

Conflicts:
	application/views/products/group_products.php