query and html templatin complete
Merge branch 'master' into develop