Merge branch 'control' into view

Conflicts:
	src/view/IMain.java
Merge branch 'view' of https://github.com/LynosSorien/LJChess into view

Conflicts:
	src/view/IMain.java