merge omegaCounter 40nm/90nm branches into chips/omegaCounter/