Commit 830838a5 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '12-update-the-models-to-address-the-new-resource-state-model' into 'develop' 

Resolve "Update the models to address the new resource state model"

See merge request !17
parents d050777a 19d07aaf