edit feed controller and twig
Merge branch 'master' of https://github.com/rommen/octagon

Conflicts:
	shoe-portal/src/Octagon/ShoePortal/CustomerBundle/Controller/NewsfeedController.php
editAction
Merge branch 'master' of https://github.com/rommen/octagon
Merge branch 'master' of https://github.com/rommen/octagon
Merge branch 'master' of https://github.com/rommen/octagon
Merge branch 'master' of https://github.com/rommen/octagon
news feed in user profile