- More changes to shortcode definition files to describe their templates
- Preview for shortcode template edit screen
- fix conflict in placester.php