I1: comment
Merge branch 'I1_news_feed_page' of github.com:Qlio/Changes into I1_news_feed_page

Conflicts:
	NewsFeed/models.py
	NewsFeed/templates/NewsFeed/news.html
	NewsFeed/views.py
	static/coffee/news_feed.coffee
	static/javascripts/packed.js