fixed a path issue in Config and updated bootstrap for new object vars
Merge branch 'master' of ssh://github.com/Noramarth/Aesir-Control-Panel

Conflicts:
	Aesir/lib/AOM/Config.php