nokogiri update
fixes a bug reported by a user (changing password not possible because then old events were marked as invalid, thus the user was invalid and not saveable)
rails security upgrade # http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
Merge branch 'master' into develop

* master:
  rails security upgrade # http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
  fixes a bug reported by a user (changing password not possible because then old events were marked as invalid, thus the user was invalid and not saveable)
adds ads
adds a link to the ads on the index page
adds a form for ads
adds simple index and show page
Merge branch 'develop' of https://github.com/dirkschumacher/iUPB into develop

# By Dirk Schumacher
# Via Dirk Schumacher
* 'develop' of https://github.com/dirkschumacher/iUPB:
  adds a form for ads
  adds a link to the ads on the index page

Conflicts:
	app/controllers/ads_controller.rb
adds a remove method
better index page and report
adds photos, nicer views, nicer URLs, and a search
Merge branch 'develop' of https://github.com/dirkschumacher/iUPB into develop

Conflicts:
	app/controllers/ads_controller.rb
	app/models/ad.rb
working (elastic)search, yay!
adds a time ago for posts and minor change in ads controller
changes search param to "q" from "search" - it's cleaner :)
enhances the index view
creates an edit view and enhances the show view of ads
Merge branch 'develop' of https://github.com/dirkschumacher/iUPB into develop

Conflicts:
	app/views/ads/_search_field.html.erb
	app/views/ads/index.html.erb
	app/views/ads/show.html.erb
some strange commit with Dirk's changes and some more