no message
Merge branch 'developer' of https://github.com/Haidora/HaidoraBase into developer