Merge origin/master

Conflicts:
	src/compiler/Parser.java
Merge origin/master

Conflicts:
	src/compiler/Parser.java
Merge origin/master