Merge branch 'release/2.1.4' into develop
fix js in account page
bump version number
Merge branch 'release/2.1.5'