Fixied Issue#47
Merge branch 'Issue#47'

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