Added 'near' operator (^), issue #290
Exposed metadata to HTML vis and added pseudo region commands for BEGIN and END of HTML vis (see issue #167 for the syntax).
Fixed typo in AQL dev documentation
Merge pull request #328 from amir-zeldes/issue290_operator_near

Added 'near' operator (^), issue #290
Before writing corpus properties file, ensure that the data directory exists.
Merge pull request #337 from larilampen/develop

Trivial fix for issue #336
HTMLVis: Cleaned up metadata and BEGIN/END instructions using new PseudoRegionMatcher
Merge pull request #329 from amir-zeldes/issue167_HTMLvis_meta

Exposed metadata to HTML vis and added BEGIN/END commands
updating to vaadin 7.2
updating to Vaadin 7.2.2

- fixes CTRL-ENTER shortcut
- tooltip delay fixed
updating to Vaadin 7.2.3
Updating to Vaadin 7.2.x
fixed findbugs warnings
update shiro to version 1.2.3 and excplitly state ehcache-core as dependency
Merged 'develop'.

Conflicts:
	annis-service/src/test/java/annis/CountTest.java
use query part of Salt URI instead of an "@" at the end of the fragment to indicate the matched annotation