Shows selection of type
Merge branch 'dev' of github.com:cipele46/cipele46-web into dev

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