Small fixes

small optimizations
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/projectboarding/BoardingController.java