Admin
Merge branch 'master' of https://github.com/dieram3/admined

Conflicts:
	admin/index.php