A previous commit changed a bunch of stuff in a bad way... I'm committing the latest stable build
aaaagh no please fix it
Merge branch 'demo_updates'

Conflicts:
	src/sys/Launcher.java
I think all the previous conflicts are resolved now...