Merge "ModelView using scene-loader" into devel/master