Left side items stay selected
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/controllers/ads_controller.rb
	app/views/application/_left_navigation.html.erb