Revert to 6212d2c
fix flash messages

Conflicts:
	config.js
	package.json
	views/createFolder.jade
missing files, fixes

Conflicts:
	app.js
	config.js