- updated logo
Merge branch 'master'