clean up code
Merge branch 'dibel-develop'

Conflicts:
	view.cpp