Finish sidebar
Merge branch 'mobilization'
remove trailing whitespace
Merge branch 'master' into videolectures

Conflicts:
	app/assets/javascripts/application.js