Fix detail
Merge remote-tracking branch 'origin/master'
Fix segment on User view
Fix nav bar when change tab
Merge remote-tracking branch 'origin/master'