content model moved to paged_content
Merge pull request #106 from willtp87/7.x.content_model

content model moved to paged_content
Now the Zip importer for pages uses the filename as the label for the OBJ datastream.
Merge pull request #107 from nigelgbanks/7.x-UCONN-15-import-filename-as-OBJ-label

Now the Zip importer for pages uses the filename as the label for the OB...
template renaming to match theme name
fix perm
Merge pull request #108 from willtp87/7.x.themeing

7.x.themeing
highlight search
remove highlight advance result
add edismax and rawurlencode
remove else.for do not search anything in the book
Merge pull request #109 from yqjiang/7.x-hightlight-search

highlight search
update build.xml for jenkins
Merge pull request #110 from qadan/7.x

update build.xml for jenkins
adding fedora 3.7.0 to travis
Merge pull request #111 from qadan/7.x

adding fedora 3.7.0 to travis
Fixes problems when the module is enabled without OCR.

Now checks if OCR is enabled before attempting to use it.
Merge pull request #112 from nigelgbanks/7.x-fix-install-issues

Fixes problems when the module is enabled without OCR.
changed page label
Merge pull request #115 from philsogaDGI/7.x

changed page label