tinymce integration
Merge branch 'master' into tinymce

Conflicts:
	app/views/proposals/_proposal.html.erb
the new editor is coming...along with a YouTube button!
dbbbbbbbb
Merge branch 'version_1_7' into tinymce

Conflicts:
	Gemfile
	app/assets/javascripts/application.js
	app/models/proposal.rb
	app/views/proposals/_proposal.html.erb
tinymce editor