Revert "Version 2.2.13 - shortcode editor code improvements and other bugfixes."

This reverts commit 0eb62e9a749e9598bdf07667617a0e6e81b4288d, reversing
changes made to bbace0759b75704f1f701ed0ea9a2e41cef670cb.
Revert "Quick bugfix."

This reverts commit bbace0759b75704f1f701ed0ea9a2e41cef670cb.
Last dev fixes (this one was done in a hurry to master, blah!).
Merge branch 'origin/dev'