add model and improve JSON naviguation
update inclusions
Merge branch 'master' of https://github.com/SINTEF-9012/cloudml