Changes to allow for loading inside the application. Doesn't quite work yet as the main driver and the root controller are not yet linked.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/hanon/app/MainDriver.java