update
Merge branch 'master' into Joris2

Conflicts:
	ConsoleApplication1/ConsoleApplication1/MineSweeper.csproj