Fix stuff
Merge branch 'master' of github.com:danielgracia/LUW

Conflicts:
	app/views/shared/_feed.html.erb