fix bug 843068
fix bug 843068
Merge pull request #1016 from tx2z/bug843068

fix bug 843068 - When signing up, some users enter their email address in the "Username" field
fix bug 862003 - Implement Prism syntax highlighter
Merge pull request #1025 from darkwing/syntax-862003-waffle

fix bug 862003 - Implement Prism syntax highlighter