Use find script instead of direct zlib library symbol
Fix segfaults on program termination
Merge some features from exercise branches
Apply cmake-init
Disable assimp
Architectural merge from exercise 1
Append log file to gitignore
Exercise 1 skeleton
Fix zip packaging
Fix warnings for Linux
Merge remote-tracking branch 'origin/master'
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit e1c9ad174d46ded6219c09a8f457b9d4ecdf50be, reversing
changes made to 960a9b374ee9947bd3f4c472286538258330a31c.
Merge branch 'master' into ws1415_3

Conflicts:
	.gitignore
	CMakeLists.txt
	data/default.frag
	data/default.vert
	packages/CMakeLists.txt
	packages/pack-cg2sandbox.cmake
	source/AbstractPainter.cpp
	source/AbstractPainter.h
	source/AxisAlignedBoundingBox.cpp
	source/AxisAlignedBoundingBox.h
	source/CMakeLists.txt
	source/Canvas.cpp
	source/Painter.cpp
	source/Painter.h
	source/Viewer.cpp
	source/main.cpp
Fix warnings and debug postfix