Merge branch 'master' into development
[UPDATE] jQuery plugin definition
Merge branch 'development'