a subir aberrado
Merge branch 'master' of https://github.com/TrueniTo/symbolic

Conflicts:
	app/controllers/institution/courses_controller.rb
	app/views/institution/courses/show.html.haml
	config/routes.rb