Refactored WaypointObject
Merge pull request #2 from ProjectSWGCore/master

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Merge remote-tracking branch 'origin/master' into WaypointObjectRefactor

Conflicts:
	src/resources/objects/waypoint/WaypointObject.java
Merge pull request #1128 from Treeku/WaypointObjectRefactor

Waypoint object refactor