Added settings to Preferences page
Deconflicting
Added profile page
Misc

Made some profile fields display correctly, made challenge link work,
added Profile link to header.
Fixed bugs + added tests
Responding to jenkins
More jenkins
Minor fixes
Fixed CSS
Resolving conflicts
Fixing tests
No images for now, plus minor adjustments
Merge pull request #890 from AdmiralJota/398_142_profiles

Profile page and additional preferences