Collection manager implemented, resolved all bugs
Resolved conflicts
Merge pull request #832 from sunnychaudhari/collection

Collection manager updated