Merge pull request #2 from albertsaave/master

Refactor Controller to remove duplicate code
Merge pull request #3 from albertsaave/master

Removed unused code, and its tests. Added test coverage for updating obs in merge concept service.
Organize, make it readable
Merged from pull