update tab and and navbar
Merge branch 'master3' of https://github.com/evilband7/tagcommunicationsystem.git into master3