Merge pull request #21 from RajeebTheGreat/master

[Shortcode] Add Image shortcode
Sort order conflict with button
[Shortcode] Add Video shortcode