Merge branch 'master' into develop
Add jquery ui asset
Merge branch 'develop'