Improve sticks management
Merge branch 'master' of https://github.com/JoeTheDentist/GJ_2014_07_13