Merge branch 'master' into marcus
fixed some tests
Merge branch 'master' into marcus
added twitter, github, linkedin and website fields for users
Merge pull request #38 from MollyMoile/marcus

added twitter, linkedin, github and website fields for users