+++Importer and upload feed updated
Merge branch 'master' of https://github.com/ondho/keystone

Conflicts:
	routes/views/importer.js
	templates/views/list.jade
	templates/views/uploadFeed.jade