Merge origin/master

Conflicts:
	adminPage.php
Merge origin/master

Conflicts:
	adminPage.php