Merge of exercise 1 skeleton fixes
Merge branch 'master' into ws1415_3

Conflicts:
	source/FileAssociatedTexture.h
	source/Painter.cpp