add Situations to conc-thrift core
add discources
Merge branch 'master' of github.com:maxthomas/concrete-thrift