updating code and readme some more
Merge branch 'master' of github.com:finger563/rosmod

Conflicts:
	code/catkin_demo_ws/README.md
	code/catkin_demo_ws/nodeActorLauncher.py