Fixed issue#10
Merge branch 'ISS10'
Merge branch 'master' of https://github.com/florianb/patient-situation

Conflicts:
	app/views/dispositions/_form.html.erb
	db/development.sqlite3
	test/functional/dispositions_controller_test.rb