bump version
update gm dependency
add license
update mocha dependency
Merge branch 'master' of github.com:thomaspeklak/express-upload-resizer

Conflicts:
	package.json