changes
Merge branch 'master' of https://www.github.com/rommen/octagon
Merge branch 'master' of https://www.github.com/rommen/octagon
updated newsfeed edit (sandeep)
newsfeed list.html.twig(krishna)
newsfeed add (pawan)
Merge branch 'master' of https://www.github.com/rommen/octagon

Conflicts:
	shoe-portal/src/Octagon/ShoePortal/CustomerBundle/Controller/NewsfeedController.php