add filter by channel_id (channel_feed_id) on lives
Merge branch 'master' of github.com:domikado/wc-apidoc

Conflicts:
	doc/api_project.js
	doc/api_project.json