modified:   view.cpp
Merge branch 'master' of github.com:Dibel/3D-Explorer
Merge branch 'master' of github.com:Dibel/3D-Explorer

Conflicts:
	view.cpp
fix bugs