upgrade callie to 1.0.25
Merge branch 'develop'