Ad show view
Merge branch 'dev' of github.com:cipele46/cipele46-web into dev

Conflicts:
	app/views/ads/show.html.erb