Merge branch 'develop'
Merge branch 'develop'
Socket connect before document ready
Fix for missing dependency
Fixing a bad idea
Merge branch 'master' into develop