Merge branch 'develop'
Updated version numbers
Fixed shortcode buttons

Fix broken short code buttons after WP 3.9 upgrade
Update readme
Commit conflicts