add app-actionbar-nav hover css
fix merged files