Template update
Merge branch '1.2-dev' of github.com:mxaGianluca/eonqm into 1.2-dev