Alias /guidelines to /faq
Merge pull request #2500 from riking/guidelies

Alias /guidelines to /faq