Reverted Categories module back to DBObject for the time being.
Merge branch '1.3'