my nuts
Merge remote-tracking branch 'origin/master'
changed tab bar icon and some other ui fixes