small changes
Merge branch 'dev' of https://github.com/pdigre/TheChessProject into dev

Conflicts:
	TheChessProject/src/no/pdigre/chess/engine/base/MOVEMAP.java