Quick Fixes
Quick Fixes on JS
Merge branch 'master' of https://github.com/withcenter/x