Merge pull request #2 from burrowsyr/feature-tidy_up_and_update

Tidied up Server code
Merge pull request #3 from burrowsyr/feature-bintheknow_controller

Added b intheknow service and feed manager
added integration tests for feed api
added missing new lines
Merge pull request #4 from burrowsyr/feature-bintheknow_controller

added feeds api and integration tests
merged with dev