clean up
Merge branch 'master' of https://github.com/sherholz/NoriPlayGround

Conflicts:
	nori/GeneratedFiles/qrc_resources.cpp
	nori/nori.vcxproj.filters
Merge branch 'master' of https://github.com/sherholz/NoriPlayGround
added missing file