Upped the time limit on the microwait.
Merge branch 'master' of https://github.com/NeuroRoboticTech/AnimatLabPublicSource

Conflicts:
	Libraries/AnimatSim/Simulator.cpp