Added more feeds
Fixed conflicts
Same css on the news sites and 'about us', notify 'front' even if no category is found, more articles displayed (20 is not enough?), added some subcategories.
Forgot to stage this file in last commit.
Revert "Forgot to stage this file in last commit."

This reverts commit f5ae39fff736b0e6ef485c5d468503beca6e7c9c.
Revert "Revert "Forgot to stage this file in last commit.""

This reverts commit 0688ff831ac5974f6497a82b92ae774e6ffeda39.
Merge branch 'develop' into fix/rssfeeds

Conflicts:
	config/bootstrap.js
Merge pull request #45 from BustByte/fix/rssfeeds

Fix/rssfeeds