fixes settings routes (adds compId)
merge conflict resolved
removes sutpid merge heads
Merge pull request #76 from andreywix/Feature-RoutesSeparation

Feature - Routes separation