MarbleView is a Group
Merge branch 'master' of github.com:RxTUDelft/MarbleUI

Conflicts:
	src/org/rxtudelft/marbleui/view/diagram/SimpleErrorView.java