changed models
Merge branch 'master' of https://github.com/amni/RISC
fixed resources bug