Merge branch 'develop' into t306_live
live stream for node detail
Merge branch 't306_live' into testing