Merge origin/master

Conflicts:
	application/views/admin/index.php
Merge origin/master