Merge branch 'master' into reporting

Conflicts:
	Gemfile
	app/assets/javascripts/app/dates.js.coffee
	app/controllers/groups_controller.rb
	app/models/comment.rb
	app/models/group.rb
	app/models/notifier.rb
	app/presenters/breadcrumb_presenter.rb
	app/views/groups/_form_advanced.haml
	config/locales/en/notifier.yml
	config/locales/pt/nav.yml
	db/migrate/20090721135542_update_all_stream_items.rb
	db/migrate/20090721210806_remove_deleted_from_notes.rb
	db/migrate/20140615223016_add_stream_item_for_sites.rb
	spec/controllers/comments_controller_spec.rb
	spec/models/verification_spec.rb