Merge pull request #59 from mpeuster/master
authorpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 21 Mar 2016 07:48:31 +0000 (08:48 +0100)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 21 Mar 2016 07:48:31 +0000 (08:48 +0100)
Resource model and integration


Trivial merge