Renamed handleCollisionAvoidance to generateTempForceWaypoint
Uncommented update map methods
Renamed handleCollisionAvoidance to generateTempForceWaypoint
Commented out a simulator line to allow for building
Added TODO comment
don't build distSim
coded sumRepulsiveForces
Merge branch 'mappy_distSimulation' into distSimulation

Conflicts:
	AU_UAV_stack/AU_UAV_ROS/CMakeLists.txt
	AU_UAV_stack/AU_UAV_ROS/include/AU_UAV_ROS/Fsquared.h