compiled & working on linux
Path planning server/client works (java implentation of server
Merge branch 'master' of github.com:nbbrooks/sami-core
Planner works with the c++ server
finished up the path planning service code
Changes to planningservice.java
Merge branch 'master' of github.com:shawnhanna/sami-core

Conflicts:
	src/sami/service/pathplanning/PlanningService.java
	src/sami/uilanguage/UiFrame.java