Avoiding thumbnail name clashes
Merge branch 'master' of github.com:backmeup/backmeup-prototype