Merge branch 'feed' into dev

Conflicts:
	messages.pot
	requirements.txt
	translations/ko/LC_MESSAGES/messages.mo
	translations/ko/LC_MESSAGES/messages.po
Merge branch 'master' into dev
Rename data update script files
Hide
Expose login