error in comment on dashboard
Merge branch 'master' of https://github.com/gwenzlau/bklp

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