fixes #176
qt generated files
Merge remote-tracking branch 'remotes/origin/master' into Resource_Manager

Conflicts:
	qteditor/QtEditor/materialmanager.cpp
	qteditor/QtEditor/ui_camerawidget.h
	qteditor/QtEditor/ui_mainwindow.h
	src/graphics/model_instance.cpp
	src/graphics/pipeline.cpp
Merge pull request #181 from nem0/Resource_Manager

fixes resources reload and fixes #176