new nginx macro
Merge branch 'master' of /srv/projects/tilestream/git/project
Merge branch 'master' of https://github.com/makinacorpus/corpus-tilestream
Allow specific folders to be restricted for upload

@leplatrem @fredericbonifas @sylvainbeo