Revert eac950d..2cfdd6b

This rolls back to commit eac950d246bd0b5e6650097e1213f7485c410851.
Revert 60dcbe1..5730367

This rolls back to commit 60dcbe12e69c1b63d990794de0c6488896effdde.
Revert "Revert 60dcbe1..5730367"

Conflicts:
	app/models/role.rb
	app/models/situation.rb
	db/development.sqlite3
Revert 2cfdd6b..6a585cd

This rolls back to commit 2cfdd6b29451df3e94311d0e78efa7a9d02254bf.
Fixed last commit