do not fatal!
Merge commit 'c8619d2643454775ed4beb2ef63537f646112e00' into formatos-enhances

Conflicts:
	app/models/course.rb