Feed news
Merge branch 'master' into feature/feed

Conflicts:
	src/BionicUniversity/Bundle/UserBundle/Entity/User.php
Merge branch 'feature/feed'