ADD: all kinds of stuff
Merge branch 'master' of ssh://github.com/SourceNews/source-news

Conflicts:
	app/views/feed.blade.php
	app/views/feed2.blade.php