Removing superfluous headers from .h and .cc files in orly/server
Merge branch 'master' into testing