Updated FileRepositories, Repository interfaces, Service Implementation
and fixed some minor issues
Merge remote-tracking branch 'origin/master'