setting up sauce connection
resolved merge conflict .travis.yml
Merge branch 'hotfix/reset'
Check for infinites and pick better first stepsize
Bump version
Merge branch 'hotfix/odestep' into develop
Merge branch 'hotfix/odestep'
Fix ODEsolver test
Bump version
Merge branch 'hotfix/odestep' into develop
Merge branch 'hotfix/odestep'
Changed wkhtmltopdf gem required
Bumped version
Merge branch 'hotfix/pdf' into develop
Merge branch 'hotfix/pdf'
Fixed faulty reference
Bumped version
Merge branch 'hotfix/undo' into develop
Merge branch 'hotfix/undo'
merge develop into feature/tests