add back to jp timezone feature
Merge branch 'dev' into angularjs
Merge branch 'angularjs' into gh-pages
compress js
change js and css from locate to cdn