Merged changes by jmslbam
Merge branch 'master' of github.com:filipstefansson/bootstrap-shortcodes