Merge pull request #732 from hegek87/havoc

Now displays the user image in the profile section
Merge remote-tracking branch 'upstream/havoc' into havoc