update logo
Merge branch '2015dev'