Changed TabBar color
Merge remote-tracking branch 'origin/master' into JosipBranch
Added tab icons and coloured background