Merge branch 'master' into querytoolbar
Merge branch 'querytoolbar' of github.com:OSBI/saiku-ui into querytoolbar