ola fleisig
Merge branch 'master' of https://github.com/kosmitzki/ICG-2

Conflicts:
	icg-ss14/bin/scenegraph/basics/Start.class