Add stuff
Merge branch 'master' of https://github.com/kolphi/ElevatorTest

Conflicts:
	ElevatorControl/src/sqelevator/application/ui/AECUI.java