patch for channel logic / channel api demo

Signed-off-by: owwlo <owwlo@163.com>
Merge branch 'container-move-2' of https://github.com/lisajluo/smg-server into container-move-2

Conflicts:
	war/demo_channel_api.html