I6: small form
Merge branch 'master' of http://github.com/Qlio/Changes

Conflicts:
	NewsFeed/templates/NewsFeed/news.html