Merge origin/master

Conflicts:
	application/controllers/admin_page.php
Merge origin/master

Conflicts:
	application/controllers/admin_page.php
Merge origin/master

Conflicts:
	application/controllers/admin_page.php
Merge origin/master