trying to get it to run on jetson

trying to get it to run on jetson
Merge branch 'master' of https://github.com/NeuroRoboticTech/AnimatLabPublicSource

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of https://github.com/NeuroRoboticTech/AnimatLabPublicSource

Conflicts:
	Libraries/AnimatCarlSimCUDA/CsNeuralModule.cpp
	Libraries/AnimatCarlSimCUDA/CsNeuron.cpp
	Libraries/AnimatCarlSimCUDA/CsSpikeGeneratorGroup.h
	Libraries/AnimatCarlSimCUDA/CsSynapse.cpp
	Libraries/AnimatCarlSimCUDA/CsSynapseIndividual.h