Merge branch 'master' of C:\Users\Fabio\PhpstormProjects\convert-wbb-to-phpbb with conflicts.
Updated Avatar and Attachment converter
Merge remote-tracking branch 'origin/master'