Merge branch 'master' into develop
Replaced bind with $.proxy
Merge branch 'develop'