Update newsticker
Add factory for news feeds
Merge branch 'dev'

* dev:
  Add factory for news feeds
  Update newsticker

Conflicts:
	app/views/main.html