tweeks
fix
Activate SMS
Merge branch 'master' into feature/User_Management

Conflicts:
	application/models/users.php