Fix for #185
Merge branch 'pr/189' into pr/188
Merge branch 'pr/190' into pr/188
Merge branch 'pr/191' into pr/188
Merge branch 'pr/188' into develop
Merge branch 'master' of github.com:imulus/Archetype
Run ConvertDataToSource before ConvertSourceToObject
Merge branch 'pr/186' into develop