added new controllers
Merge branch 'master' of github.com:woss/Torchwood into develop
Merge branch 'develop'