FD-05_DebateLayout General debate layout
Merge branch 'master_Asma' into FD-05_DebateLayout

Conflicts:
	app/assets/stylesheets/debates.css.scss
	app/assets/stylesheets/static_pages.css.scss
	app/views/debates/show.html.erb