Solved Issue#50
Merge branch 'Issue#50'
Merge branch 'master' of https://github.com/florianb/patient-situation
User saved when doing procedure
Implemented Transport-Overview
added before_filter is_admin
added before_filter to RolesController
Empty commit
fixed iss31, cleaned up layout
Merge branch 'master' into iss31

Conflicts:
	app/models/user.rb
	config/routes.rb
	db/development.sqlite3
devbase
Merge branch 'iss31'
Merge branch 'master' into release