fixes bugs with html escaped links and enumeration problems.
Merge branch 'feature/rails3' into fix/timelines_html_safe_and_enumerations
Merge branch 'feature/rails3' into fix/timelines_html_safe_and_enumerations

Conflicts:
	app/models/enumeration.rb
Fix missing html escape bugs
Merge pull request #188 from opf/fix/timelines_html_safe_and_enumerations