Merge pull request #310 from labatbouta/sbl-dev

makes fix to my broken code in AddDeckController
Delete Mock Objects that promised functionality that did not deliver