[FIX] Parsing options, doc() and collection(). Closes #905
[MIN] merge
Merge branch 'master' of github.com:BaseXdb/basex into nosql
fix java nullpointer exception in connect