FAIL
FAIL
Merge remote-tracking branch 'origin/master'

Conflicts:

	TPE/bin/de/hsmannheim/ib2/tpe/ws2014/g05/ueb02/jUnitTest/ImmobilieTest.class