bugfix dopo merge
Merge branch 'master' of https://github.com/neiroc/techweb/.