Fix uid and trigger mm:namechange for QueryModel for #132.
Merge remote-tracking branch 'template/master'
Add editable query names for #132.
Merge remote-tracking branch 'template/master'