AOO-266 php error on Android // changing shortcode name to avoid clash with wp functionality
Merge remote-tracking branch 'origin/master'