Updated all shortcodes to <?php echo for compatibility
Updated version internally
Merge branch '31-shortcodes'
Fixed merge conflicts