fixed compile errors
Merge branch 'master' of https://github.com/faylar/HobbyRPG