Merge branch 'f-doc-query-templates' into 'dev'

DOC: converted pdf doc for query templates into standard doc and added a few additional sections

See merge request !39