bump cypress version to 2.5.0
Merge branch 'cypress25' into cypress2_5