Update sdk and gradle.
Add new launcher icon.
Merge master.