Update TinyMCE to version 3.5.10
Merge branch 'master' into coconut_tiny_mce

Conflicts:
	lib/tiny_mce/assets/tiny_mce/plugins/autolink/editor_plugin.js
	lib/tiny_mce/assets/tiny_mce/plugins/media/js/media.js
Boyscout: remove .orig files from repository
Merge pull request #3 from ryreitsma/coconut_tiny_mce

Coconut tiny mce