Ads filtering.
Merge branch 'dev' of github.com:cipele46/cipele46-web into dev

Conflicts:
	app/controllers/ads_controller.rb
	app/models/ad.rb
Merge branch 'dev' of github.com:cipele46/cipele46-web into dev
Ads json response.