Fixes #1286 SQL error while Upgrade
Merge pull request #1287 from JN-Jones/fix-1286

Fixes #1286 SQL error while Upgrade
Fix #1235 Editor post icons

Removed hard coded break after 10 icons.
Added class to label surrounding icons and radiobuttons to keep them
together.
Fix #1235 Editor post icons addition

Missed some things.
Removed variable not needed anymore.
Added correct template version.
Merge pull request #1290 from sthag/feature

Fix #1235 Editor post icons