Merge branch 'icon-paths' into twitter-update
Merge branch 'twitter-update' into staging
Minor JS updates