libs fix
Merge branch 'master' of https://github.com/RadioactiveGangsters/RIDServer
fixed some merging issues that prevented compilation