Documentation for configuration and queries
Merge branch 'feature/doc' into develop
minor changes
Merge branch 'release/13-10-04'