Improved severals controllers #43
Merge branch 'rails4' of github.com:cirope/mawidabp into rails4

Conflicts:
	app/controllers/organizations_controller.rb