Update README.md
Merge branch 'master' into feature/generators

Conflicts:
[RESOLVED]	README.md