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

Conflicts:
	application/controllers/user/dealer.php