Merge pull request #698 from hegek87/havoc

Mostly done with account page. SOTD and drag and drop file upload are the only things left.
Besides alerts, the account page (except sotd, group manage, and drag and drop file upload) is now finished.
Merge remote-tracking branch 'upstream/havoc' into havoc