Merge pull request #675 from hegek87/havoc

Profile account page is mostly done (except for the drag and drop file u...