Merge remote-tracking branch: upstream/master
Copying interesting configuration options from ScalaDatabase.md.
DB config property name is "password" not "pass"

I've figured this one out by copy-pasting from the docs. Shame on me :-p
Merge pull request #2400 from arielscarpinelli/master

Copying interesting configuration options from ScalaDatabase.md.
Merge branch 'master' of github.com:shantanusharma/Play20
Merge remote-tracking branch: upstream/master