Merge branch 'master' into dev
added authoring "mini"
Merge branch 'dev'