prepare branch for second assignment
Merge remote-tracking branch 'origin/ws1314_2' into johannes-local

Conflicts:
	source/Painter.cpp
	source/Painter.h
some merge fixes, but refactoring seems required