Merge branch 'release/1.0'
Changed prototype and scriptaculous to load locally.
Merge branch 'hotfix/1.0.1' into develop