turn version to 2.5
fix drop issue (caused by last change)
Merge branch '2.5.x' of github.com:OSBI/saiku-ui into 2.5.x
Merge branch 'master' into 2.5.x