add create feed and collection
Merge branch 'master' into cj-sql