Added directory option

and an option to append label to directory path
not needed
Merge branch 'refs/heads/jkaberg-develop' into develop
Merge branch 'develop' of github.com:RuudBurger/CouchPotatoServer into develop