move docs over (bug move-docs)
run webpoy on a default port (bug 1021991)
Commit from Mozilla Verbatim by user havarh.: 87 of 87 strings translated (0 fuzzy).
Merge pull request #496 from lissyx/locale.fr

fr: Updating french locale
Clear pin_was_locked_out on reset (bug 1027148)
Merge pull request #495 from mstriemer/clear-was-locked-on-reset-1027148

Clear pin_was_locked_out on reset (bug 1027148)
Merge pull request #485 from andymckay/move-docs

move docs over (bug move-docs)
Merge pull request #484 from andymckay/1021991

run webpay on a default port
remove the need for settings/local.py (bug 1021991)
Merge pull request #483 from andymckay/999774

remove the need for settings/local.py (bug 999774)
fix up settings override
and now lets fix up travis
pep8 fixes
jenkins needs no stinkin settings anymore
add in some lxml love
Merge pull request #497 from andymckay/travis-fixin

add in some lxml love
Commit from Mozilla Verbatim by user rpmdisguise-otros@yahoo.es.: 87 of 87 strings translated (0 fuzzy).
Merge branch 'master' of github.com:mozilla/webpay
Updated Polish translation
Merge pull request #498 from Witia1/master

Updated Polish translation