somehow float_t was not found by vs2012, not even in math.h.
minor additions to PainterMode
Merge branch 'master' of https://github.com/hpicgs/cg2sandbox

Conflicts:
	source/AbstractPainter.cpp
	source/PainterMode.h
added FileAssociatedAsset for any assets watched by a QFileSystemWatcher
uninitialized member
const references
updated README: MSVC toolset v100 does NOT work
fixing some typos + documentation
FileAssociatedAsset::addResourcePath
reducing scope of a variable
additional error message
adding phong shader code
adding some 3d model data
fixed FileAssociatedShader "incompatibility" with vim

Vim does not always simply write to the saved file but replaces them with its swap file.
The removal of the shader source file would cause QFileSystemWatcher to unwatch it.
Hence, editing shader source files with vim would break the intended behavior.
Merge Pull Request 2 from j4yk
add new features for next assignment
Merge branch 'master' into ws1314_2

Conflicts:
	source/CMakeLists.txt
	source/Painter.cpp
	source/Painter.h
Fix inline misuse
Merge branch 'master' of github.com:hpicgs/cg2sandbox
Reduce gcc compiler warnings