Change project structure
app icon
Merge remote-tracking branch 'origin/master'
merged conflicts