adding empty annis-admin project
more work on the Import GUI to actually use the new web service
merged develop branch
adding a first simple test case
adding a first simple test case
Finish annis-3.1.6
Merge remote-tracking branch 'tk/feature/distinct-annotations' into feature/distinct-annotations
Merged 'develop'.
Added: change URL on basetext menu change to reflect new selected segmentation (closes #298).
Fixed URL to delete the segmentation fragment in the URL if user selects 'tokens'
Merge pull request #326 from amir-zeldes/issue298_basetextURL

Added: change URL on basetext menu change for segmentations, fixes #298
some new test queries for advanced non-reflexitivity
only add non-reflexitivy condition if really needed
generalize the concept for both schemes
Use the node annotation namespace/name in the find sql generator to make the results distinct.

The distinct condition has been updated to be more conservative
updating to require at least Java 7
Merged 'develop'.
append the node annotation namespace and name to the salt URI of the match
ignore node annotation in salt URI when parsing it for the subgraph query
"_=_" is now also non-reflexive in the newer definition