[FIX] XQuery, JSON Serialization
[FIX] XQuery, Closes #1042.
[MIN] Checkstyle 6 compliance
Merge branch 'master' into sec
[ADD] XQuery, User Module