added functionality to slider
bringing in master
Merge branch 'master' into resize
Merge pull request #52 from fox-squirrels-2013/resize

Resize