again
Update controllers/admin.php
Update controllers/admin.php
Update .gitignore
Merge branch 'master' into nightlight

Conflicts:
	.gitignore