Added somre more logic so that things compile differently
under windows and linux
Merge branch 'master' of https://github.com/NeuroRoboticTech/AnimatLabPublicSource