Merge branch 'release/1.1.16' into dev
Merge branch 'master' into dev
build unconflicted jquery functions
bump version
Merge branch 'release/1.1.17'