Merge branch 'feature/issue-771-ode-solver' of https://github.com/stan-dev/stan into feature/issue-771-ode-solver
dealt with merge conflict
removed conflicting manual doc/stan-reference pdf