dando forma
adds institutions
Merge github.com:nestier/agalma into dev

Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/secret_token.rb
	config/routes.rb