added serive and filer generators
Merge remote-tracking branch 'origin/master'