Even more server management
Merge branch 'master' of https://github.com/nosedive25/Together

Conflicts:
	dashboard.php