parser.
Merge branch 'master' of https://github.com/anders9/akita

Conflicts:
	src/anders/akita/parser/ZqlJJParser.java
	src/anders/akita/parser/ZqlJJParserTokenManager.java