Merge branch 'master' into natnet-v2.6

* master:
  Add debugDrawInformation method
  Small update

Conflicts:
	src/ofxNatNet.cpp
Merge branch 'master' of github.com:satoruhiga/ofxNatNet

Conflicts:
	src/ofxNatNet.cpp