Prepared diag_nameQuery for diag_dateQuery
merge master commit
Merge branch 'master' into diag_dateQuery
removed redundant files