Marathon branch with safe rosbridge

a few fixes and making it all more mergeable back into master later on by separating apache-specific things from the more general webtools