Merge pull request #71 from Prims47/master

Add Context property in serializer Model Category
Fix error with empty contextCode