merge manuel 2
Merge branch 'master' of https://github.com/Qonic/thundermafia