bugfixes, all tests are ok now
Merge remote-tracking branch 'origin/master'

Conflicts:
	Grafikeditor JDraw.iml