0934
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/customer.php
	application/controllers/dashboard.php