- hooking up ads/show favorite
Merge branch 'dev' of github.com:cipele46/cipele46-web into dev

Conflicts:
	app/models/user.rb
	app/views/ads/show.html.erb
	config/routes.rb