fix issue arg_proxy and arg_phrase
scroll to displayed object in table of contents
add GPL V3 licence
fix bug in concordance
Merge pull request #78 from clovis/master

Update upstream
various bug fixes
Merge pull request #80 from clovis/master

Push fixes upstream
disable all searches but ranked relevance when selecting more than one word
make ranked relevance work with new query parser, refine ranking algorithm
Merge pull request #81 from clovis/master

Reenable ranked relevance, fix various issues with it
more refinements to rankikng algorithm
Merge pull request #82 from clovis/master

More updates to ranked relevance
workaround padding weirdness in Firefox and IE
fix layout bug in collocations: this only affects Firefox and IE
Merge pull request #83 from clovis/master

Fix CSS issues in Firefox and (hopefully) IE
Merge pull request #84 from rwhaling/master

merge parser and query fixes from rwhaling
add an error mako template, and some other fixes
Merge pull request #85 from clovis/master

Add error template
Merge pull request #9 from ARTFL-Project/master

merge downstream