parser, inner-query
Merge branch 'master' of https://github.com/anders9/akita

Conflicts:
	outdata/sqltest.txt
	src/anders/akita/parser/ZqlJJParser.java
ignore file.