Adding dynamic collection view
fix merge conflict
Readding dynamic collection view
Merge branch 'collection-jquery'