Added UnitResolver.parseUnit
Merge branch 'master' of https://github.com/axiomalaska/phenomena