add back to jp timezone feature
Merge branch 'dev' into angularjs