added logo
Merge branch 'development'