Update mocks, crosslink resources
Merge pull request #57 from FCStrike/master

Update mocks, crosslink resources