HPT-99: Using Jettywrapper startup_wait parameter to allow startup time
Increasing Jetty startup_wait to 120 after an 80 second start time on Travis
hpt-93 changes made to pages_controller.rb and page.rb.  _form.html.erb still needs to be updated.
Merge pull request #21 from randalldfloyd/HPT-99_Increase_Jetty_startup_wait

HPT-99: Using Jettywrapper startup_wait parameter to allow startup time
Additions to OCR CRUD task.

Signed-off-by: rwingiupui <rwing@iupui.edu>
[HPT-124] When page editing is called from paged view, return to paged view upon submission.

This introduces a session key "came_from" whose value names the object
type (:paged, :page) which requested the edit.
Return to the owning paged (if there is one), not the list of pageds.
[DS-124] Wrong helper was generating wrong return URLs.
Merge pull request #20 from mwoodiupui/HPT-124

[HPT-124] When page editing is called from paged view, return to paged v...
Merge pull request #22 from rwingiupui/hpt-93

Hpt 93 - Add field for OCR text datastream in CRUD form for Page Object