Added folder selection
Merge branch 'develop' of http://github.com/thelightbird/TimeBox into develop