Merge origin/master

Conflicts:
	src/pgn/parser/Parser.java
	src/pgn/tokenizer/TokenizedGame.java
	src/pgn/tokenizer/Tokenizer.java