Added Json attributes to Calendar domain entities
Merge branch 'Calendar_domian_properties_adjustment'