change rePosition
fix
manual merge for issue 24
Merge remote-tracking branch 'upstream/master'

Conflicts:
	boxwidget.cpp
	mainwindow.ui
	zgui-qt.pro
Merge remote-tracking branch 'upstream/master'
ScenePanel and LayerPanel