Avoid path traversal with "../"-filenames
Merge branch 'master' of github.com:derjust/jquery-file-upload-middleware

Conflicts:
	lib/uploadhandler.js