Merge branch 'lexer_refactoring' into lexer_tokenpositions

Conflicts:
	lexer/lexer.cpp
	lexer/lexer.hpp
Merge branch 'lexer_tokenpositions' of https://github.com/djrieger/mjplusplus into lexer_tokenpositions

Conflicts:
	lexer/lexer.hpp