merging

Signed-off-by: Steve Dekorte <steve@dekorte.com>
Merge branch 'master' of github.com:Voluntarynet/NavNodeKit