Merge to single repository (develop)

Merge from shinetechs/features/100-Upgrade-Jquery to new branch
"features/100-Upgrade-Jquery" (develop)