Merge branch 'release/1.2.0' into develop
Merge branch 'master' of https://bitbucket.org/cwm/hypo into develop
Fixed LifeSpan methods so they're properly camelcased
Prepared release 1.2.1
Merge branch 'release/1.2.1'