Added new activity units: kBq, MBq, GBq, mCi, and muCi
Merge branch 'newActivityUnits' into develop