General Clean Up
General File cleanup. Will fork to create now.
Merge branch 'origin/develop'

Conflicts:
	App/Controller/Controller.php
	App/View/AdminView.php