Merge branch 'homework_4_5' of https://github.com/PirnPurgis/KIKA into homework_3

Conflicts:
	build.xml

I have no idea whats going on
Still dont know whats going on.