commit
Merge branch 'master' of github.com:joshianand/LeadManagement

Conflicts:
	application/config/routes.php
	application/controllers/user.php
	application/models/admin_model.php
	application/views/admin/registration_form.php
registration with changes