Waypoint tweaking
Merge remote-tracking branch 'origin/master'

Conflicts:
	UnityProject/UnityProject-csharp.sln
	UnityProject/UnityProject.sln