Merge Hydra7 and Image Processing into Master