adding base code for shortcodes
bumping version to 1.2
Merge branch 'release/1.2'