1. renaming 2. simplifying query parser.
Merge branch 'master' of github.com:searchivarius/annographix