Folder listing endpoints done
Merge branch 'master' of github.com:maxscheiber/cumulonimbus

Conflicts:
	server/app/controllers/api.js
	server/app/routes.js