Reverse Bad Merge

Conflicts:
	src/main/view/View.cpp