modified list.html.twig
Merge branch 'master' of https://www.github.com/rommen/octagon

Conflicts:
	shoe-portal/src/Octagon/ShoePortal/CustomerBundle/Resources/views/Newsfeed/list.html.twig
fixed conflicts