Merge branch 'master' of https://github.com/siebenundvierzig/dgraph

Conflicts:ADd
	js/main.js
ddd