issue fixed of design and attachements
Merge branch 'master' into development
Add admin dashboard