Merge remote-tracking branch 'upstream/master'

Conflicts:
	B9Creator/b9layout/b9layout.cpp
	B9Creator/b9layout/b9layout.h
	B9Creator/b9layout/modeldata.cpp
	B9Creator/b9layout/modelinstance.cpp
	Root/B9Creator/b9layout/modeldata.h
	Root/B9Creator/b9layout/projectdata.cpp
	Root/B9Creator/b9layout/triangle3d.cpp
	Root/B9Creator/mainwindow.cpp
Updating the Fork to the latest version