+++Error handling in uploadFeed.js
Merge branch 'master' of https://github.com/ondho/keystone

Conflicts:
	routes/views/importFiles.js
	routes/views/uploadFeed.js
Merge branch 'master' of https://github.com/ondho/keystone

Conflicts:
	routes/views/uploadFeed.js
+++solve conflicts
Merge branch 'master' of https://github.com/ondho/keystone

Conflicts:
	routes/views/uploadFeed.js