Merge origin/master

Conflicts:
	connectFour/entity/View.java