Merge branch 'master' into develop
Added jquery-mousewheel plugin to components
Merge branch 'develop'