Version bump 2.5.0.
Deploy any release branch to staging.
Merge branch 'develop' into release/2.5.0

Conflicts:
	bower.json
Check for release/* branches for deployment.
Merge branch 'release/2.5.0' into develop