fixes
lots of fixes
fixes
travis allow failures
refactoring common/tools and adding servicescommand
refactoring common/tools and adding servicescommand
merging and fixing