[BP] - Changed to scala 2.10.0 - think that .2 was a step too far... for now
Merge remote-tracking branch 'origin/master_210' into master_210