Introduce Generic ActionListener
Introduce Generic ActionListener
Merge
Merge
Merge origin/master

Conflicts:
	connectFour/entity/AbstractPlayer.java
	connectFour/entity/Game.java
	connectFour/entity/GuiPlayer.java
	connectFour/entity/View.java
Merge origin/master

Conflicts:
	connectFour/entity/View.java
Merge origin/master

Conflicts:
	connectFour/entity/View.java
Merge origin/master

Conflicts:
	connectFour/entity/View.java