Fixed some warnings
Merge branch 'develop' of github.com:mangoszero/server into develop