Instantiation of the geostore service layer by spring
Removed unused class
Tests working with spring
Mockito scope reduced to test
Minor changes
Merge branch 'springization'