nothing
Merge branch 'master' of https://github.com/Qlio/Changes

Conflicts:
	news_feed/views.py