Merge branch 'master' into dsuch-f-gh259-display-version-web-admin
GH #259 - Store Zato version in HTML's generator meta tag.
Merge branch 'dsuch-f-gh259-display-version-web-admin'
Merge branch 'master' into dsuch-f-gh271-cassandra-query-templates