[FlightPlan] Competition Waypoints

Conflicts:

	conf/flight_plans/TUDelft/IMAV2013_rotorcraft.xml