added tabBar controller
Merge remote-tracking branch 'origin/master'
modifuend inApp navigation