Merge pull request #1807 from CrowdHailer/master

create FAQ page
question on controller route setup
CSRF protection in tests