new versions of q2cli and q2templates

[Liubov Chuprikova]

Hi Andreas,

I have checked q2cli (minor changes) and upgraded q2templates. They are
ready for upload now.

With regards,
Liubov