use 2.5.x ui
upgrade to version 2.5
switch marketplace version.xml to 2.5
Merge branch '2.5.x' of github.com:OSBI/saiku into 2.5.x
use different branch for marketplace info