Added TinyMCE button. Currently doesn't do what I need but does work.
Merge remote-tracking branch 'origin/master'

Conflicts:
	shortcodes/design/shortcodes.php