Merge branch 'master' into development
updated design
Merge branch 'development'