License and readme
Merge branch 'develop' into staging