test
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/Admin.php
test
Merge remote-tracking branch 'origin/master'