Merge branch '7.x-1.x' of git.drupal.org:project/wetkit_wysiwyg into 7.x-2.x
Remove deprecated TinyMCE plugin.
Merge branch '7.x-1.x' of https://github.com/wet-boew-wem/wetkit-wysiwyg into 7.x-2.x

Conflicts:
	wetkit_wysiwyg.module
Merge branch '7.x-2.x' of https://github.com/wet-boew-wem/wetkit-wysiwyg into 7.x-2.x