added logo
Merge branch 'dev'