Merge origin/master

Conflicts:
	application/controllers/users.php
	application/views/template/head.php
Merge origin/master