Allow multiple file uploads
Merge branch 'master' of github.com:ivo-/tekken
Merge branch 'master' of github.com:ivo-/tekken