JSON DAO for Categories added
Resolved conflicts