users manager v1.
Merge remote-tracking branch 'origin/users' into develop

Conflicts:
	system/application/logs/log-2014-11-05.php