Added tests for resources (integration and controller).
Merge branch 'master' of https://github.com/Tambling/whetstone
Merging in changes.