Merge branch 'develop' of github.com:IU-Libraries-Joint-Development/PagedMedia into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Adding the field type so that paged objects can be discovered and filtered on content type
Adding the type field to views and forms
Adding the type field to tests and refactoring to fix HPT-150
added 'Media Type' search facet w/minimal specs; BUG on removing facet from search results
added to rspec tests and factory objects
[HPT-160] Replace physical page number with previous-, next-page references.

Also undo a previous commit that split the composition of
params.require from params.permit in Page.  That previous commit
papered over the real problem, which was that the tests themselves
were wrong, and broke Page.update and Page.save.
Merge pull request #1 from aploshay/HPT-79_limit_discovery_by_type

Hpt 79 limit discovery by type: facet search turned on in interface, spec tests
Merge pull request #29 from mwoodiupui/HPT-160

[HPT-160] Replace physical page number with previous-, next-page references
Merge pull request #30 from randalldfloyd/HPT-79_limit_discovery_by_type

[HPT-79] Limit discovery by type
Merge remote-tracking branch 'upstream/develop' into develop
rspec test added for page ordering. Temporary working code in view to be moved to model.
Page ordering moved to model, made available to view through controller.