overloaded MeshObject::setScale()
showing picture in current directory
Merge branch 'dibel-develop'

Conflicts:
	view.cpp
	view.h