commit
Merge remote-tracking branch 'origin/master'
tab bar layout and add some icons.