BNF parser modified, change in delimiters regex.
Merge origin/master

Conflicts:
	Project/src/project/Parser.java