added filestystem, upload not working yet
Merge branch 'master' of https://github.com/SerendipityNL/Doctopus

Conflicts:
	beta/002/app.njs