Merge pull request #5 from wenbing/issue-4

fix issue-4
custom uploadDir fixed #4
Release 0.1.0
Merge remote-tracking branch 'upstream/master'

Conflicts:
	controllers/file.js