Merge pull request #676 from hegek87/havoc

Added skeleton of tags, which includes translation configs, andimplement...
Merge remote-tracking branch 'upstream/havoc' into havoc