Merge branch 'master' into develop
Sort jQuery dependencies better
Merge branch 'develop'