added x-email
merged
Merge branch 'master' of https://github.com/codedoc/codedoc.academy
some fixes