Customer, Engine etc
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/UI/UIProjectView.java