Added social media links to user profile page
Resolving conflicts.
Added fields to user profile.
Merge pull request #35 from Webcraft-Myplanet/UF-55

Added social media links to user profile page