Merge origin/master

Conflicts:
	src/Grammar/MiniFun.g
	src/Grammar/MiniFunLexer.java
	src/Grammar/MiniFunParser.java