use scala.math package object instead of deprecated scala.Math
Merge branch 'master' of ssh://git@github.com/cuali/ti.git