Conflict resolved in themes collection items
Merge pull request #448 from sunnychaudhari/mongokit

Conflict resolved in themes collection items