Fixed errors in messages table
Fixed merge conflicts
Merge branch 'master' of github.com:pilliq/orangehippowolf