Fixed repositioning of edge label #1017.
fixed select2 modal bug
Removed debug output
Merge branch '2.2' of github.com:triAGENS/ArangoDB into 2.2