First version to get folders and files of dropbox
Merge branch 'master' of https://github.com/siebenundvierzig/dgraph

Conflicts:
	js/main.js
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/siebenundvierzig/dgraph

Conflicts:
	js/main.js