Cambios en el sgs
Merge branch 'master' of https://github.com/gobierno-abierto/gobierno-abierto

Conflicts:
	app/controllers/admin/comments_controller.rb
	app/models/comment.rb
	app/views/admin/information_requests/_data.html.haml
	app/views/user_mailer/new_information_request_comment_invite_user.html.haml
	app/views/user_mailer/new_information_request_comment_invite_user.text.erb
Rutas para la agenda de eventos
Merge branch 'master' of https://github.com/gobierno-abierto/gobierno-abierto