Merge origin/master

Conflicts:
	src/sudoku/Sudoku.java
Merge origin/master