Merge branch 'master' into v3.0
minor changes
added assets
Merge branch 'v3.0'