Merge pull request #729 from hegek87/havoc

File upload in the post modal is nearly completed.
Merge remote-tracking branch 'upstream/havoc' into havoc