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

Conflicts:
	application/views/user/product_show.php