Merge branch 'dev/AR-1_serialization' into stable
Issue #AR-5_empty_json: Handle the case where the archetype json is empty:

{""fieldsets"": []}

Currently this throws an exception. Handle by setting returned model to null.
Merge branch 'stable' into dev/AR-1_serialization