Remove duplicate button shortcode.
Merge branch 'dev' of github.com:MickeyKay/trestle into dev