Merge branch 'hotfix/TravisFix3'
Add jQueryUI
Merge branch 'hotfix/jQueryUI' into develop