Merge pull request #24 from deborahgu/develop

(Bug 2774) Creating a hook that can reference a single faq to point to d...
(Bug 2046) Update MissKat's information
(Bug 2046) Add alierak to staff page
(Bug 2046) Take down John Chodan
(Bug 2046) Update Mark's bio
(Bug 2046) Revise Azurelunatic's profile
(Bug 2046) Denise has three cats now
(Bug 2046) ChemicalLace is now a researcher
(Bug 2046) Add Deborah
(Bug 2046) Amend Audra's entry
Merge pull request #25 from foxfirefey/Bug2046/staffpage

Bug2046/staffpage
Fix error when FAQ doesn't exist
Fix silly syntax error
(Bug 2046) Fix typo
Merge branch 'release-1.14' into develop

* release-1.14:
  (Bug 2046) Fix typo
  Fix silly syntax error
  Fix error when FAQ doesn't exist
(Bug 2046) Update PauAmma's bio
(Bug 2046) Updated Afuna's bio
Merge pull request #26 from afuna/staff-bug2046

Update more bio
(bug 4897) Nonfree version of new hook for CC warning

the hook is called in the dw-free patch accompanying. THIS IS NOT
TESTED, since my 'hack isn't set up to do payments, so it may not work
or the formatting may be weird!
Merge pull request #27 from rahaeli/bug4897-nf

(bug 4897) Nonfree version of new hook for CC warning