Updated logo with trademark and retina sizes.
Merge branch 'release_1.7'