Do not specify either HTTP or secure HTTPS protocol for JS resources so that they can load on the current protocol.
drupal_add_js() doesn't work without a protocol.
Merge branch 'master' into development