EDX-401: Modify marketing site urls
Merge pull request #166 from yokose-ks/EDX-401

EDX-401: Modify marketing site urls
EDX-299: Fix error messages in password reset confirm