.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	ParserCore/src/Parser/TokenType.java
	ParserCore/src/Util/GenericMethodValue.java
	ParserCore/src/Util/GenericMethodValues.java