User import
Merge branch 'master' of https://github.com/jneighbs/newsfeed

Conflicts:
	nf_server/static/js/fetchData.js