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
Added active players page
Merge remote-tracking branch 'shadowshade/722_user_activity' into 722_whos_online
Merged in (and deconflicted) profile page branch
Minor fixes
Merge branch '398_142_profiles' into 722_whos_online
Styled page + added link to it
Fixed CSS
Merge branch '398_142_profiles' into 722_whos_online
Bug fixing + writing tests
Typos in test definitions
Resolving conflicts
Fixing tests
Resolving conflicts.