Apply david's patch for upgrading rails to the 3.0.19.
Add staff portal authority to the development env.
Merge branch 'master' into 2.1