Merge branch 'master' of https://github.com/danialfarid/angular-file-…

…upload

fixed conflict

Update README.md

merged PRs and updated readme

Merge pull request danialfarid#1340 from pra85/patch-2

Fix typos

Fixed danialfarid#1299, fixed danialfarid#1300

Merge branch 'master' of https://github.com/danialfarid/angular-file-…

…upload

minor fixes

Merge branch 'master' of https://github.com/danialfarid/angular-file-…

…upload

Merge branch 'master' of https://github.com/danialfarid/angular-file-…

…upload