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

Conflicts:
	application/controllers/user/dealer.php
	application/controllers/user/product.php
	application/controllers/user/support.php
ll
Merge branch 'master' of github.com:neonankiti/Shotoku