Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	application/controllers/user.php