Merge branch 'coffee+scss' of github.com:oomushi/jquery.multiUpload.js into coffee+scss

Conflicts:
	scripts/jquery.multiUpload.js.coffee
Merge branch 'coffee+scss' of github.com:oomushi/jquery.multiUpload.js into coffee+scss

Conflicts:
	scripts/jquery.multiUpload.js.coffee