allow moving boxes
merge commits
Merge branch 'master' into dibel-develop

Conflicts:
	view.cpp