rename FAQ in navigation
Merge branch 'master' into develop