put cluster and combo jsp togeht
Merge remote-tracking branch 'origin/master'