ok
Merge branch 'master' of https://github.com/neonankiti/Shotoku

Conflicts:
	application/views/user/product_show.php