add tests
Update API_doc_V2.md
changed models
Merge branch 'master' of https://github.com/amni/RISC into trades-and-alliances
fixed merge conflicts