Deleting unused modules.
Merge branch 'drupal-contrib' into production

Conflicts:
	sites/all/libraries/tinymce/jscripts/tiny_mce/license.txt
	sites/all/modules/smtp/phpmailer/LICENSE