pp of to bind is bound
add a way to benchmark the salt mapping
do not use listIterator if not needed and removed uncompileable helper class
do not commit benchmark db
add guava dependency
Merge branch 'benchmark'
updating Apache Shiro to 1.2.2
Implement a first version for using the corpus.properties file in the annis
gui. It works for the left and right context pretty well.

Context steps, segmentation and results per page are left.
fixes #122

The context is now configurable for annis3 again via annis-service.properties
or a specific corpus.properties  file in the relAnnis/ExtData folder.

Note, that the max left or max right context from a custom corpus.properties
file is overwritten by the values defined in the annis-service.properties file,
when they are bigger:

min(corpus.max-left-context, annis-service.max-left-context)
min(corpus.max-right-context, annis-service.max-right-context)
The annis-gui supports the results-per-page property.
fixes #110
Check if the corpus config contains a segment definition. If not, take the token
layer.
fixes #130
Use the key for getting default property not a constant (:
Keep custom set values for search options in the comboboxes.
Merge remote-tracking branch 'korpling/master' into flatquerybuilder
Set benchmark tests to @Ignore, because the corpora to test are hard wired and
usually these tests will not work on other databases.
Merge remote-tracking branch 'korpling/master' into flatquerybuilder