Add adding users
Merge branch 'devJ'

Conflicts:
	application/controllers/user.php