Finish feature/healthfitness

The Health & Fitness feature has been completed, and can now be merged into the development branch in preparation for v1.2.