Add: User authentication, on conflict, resolve as this build.

Merge origin/master

Conflicts:
	application/views/content/user/elements/user_info_view.php