Merge pull request #40 from clovis/master

add page links
Merge pull request #41 from clovis/master

minor fix
Merge pull request #42 from clovis/master

Remove hardcoded path in Javascript
Merge pull request #43 from clovis/master

Minor fix
Merge pull request #44 from rwhaling/master

merge upstream
Merge pull request #45 from rwhaling/master

Frantext debugs.
Merge pull request #46 from rwhaling/master

unicode fixes from rwhaling
Merge pull request #1 from ARTFL-Project/master

update branch
remove hardcoding in header
Merge pull request #47 from rwhaling/master

update branch
Merge pull request #2 from ARTFL-Project/master

update branch
remove more hardcoding
perform ranked relevance search on metadata
remove old code
fix autocomplete for metadata
remove calls to query parser for autocomplete; add collocate frequencies to the sidebar
simplify and move sidebar javascript functions to the main javascript file
clean-up javascript and remove python variables from the javascript mako file
update jquery ui, jquery, rewrite most javascript functions, use jquery ui for the interface
tweaks to the search form layout, minor changes in the javascript