Finalized joint paths for demo
Fixed flood of logs and state setting that occurs when e-stop or other erros state exist
Added state output to state machine and gui
Cycle stop now works from any state during normal cycle (instead of just in the WAIT state)
Added material state to state machine logic.  Material state now checked in WAIT state
Synchronized code with controller (including all files, mtconnect and ros-i)
Re-added make file, mistakenly deleted
Merge branch 'master' of github.com:mtconnect/ros_bridge
Merge branch 'master' into nist