Merge branch 'master' into production

* master:
  Create README.md
  License file not needed
Merge branch 'production'

* production: