Update version string to 2.5.0-pre.1
Merge branch 'master' into bower-jasonrobitaille
Updated for version 2.5.0 details