Fixed Create waypoints, and entry and exit points

Conflicts:
	apollo/map.py