fix navBar
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
fix design Fad Detail
Merge remote-tracking branch 'origin/master'
merge commit