Merge pull request #1 from dems59/master

Sidebar blank space fix
hard at it. controllers and templating.
comments for challenges
comments for challenges2
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/home/faqs.html.haml
	app/views/users/show.html.haml