format comments
Bump Jersey, Grizzly and Jackson versions.

We observed a problem with threads getting stuck with 100% CPU usage in epoll.
Using newer Jersey version seems to resolve this.
Newer Jersey requires JSON serialization features to be added explicitly.
Update Enunciate version. v1.29 fixes a validation bug we reported.

This allows us to resume auto-generating API docs for master.
Addresses #1558
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/org/opentripplanner/routing/algorithm/GenericAStar.java
Copy bogus name flag to split street edges from parent edge
Restore area edge linking
revert
Add translations and small fixes