Work to bring the insulin calculator up to scratch
Improvements to the Insulin Calculator
Additional work towards insulin calculator integration
Merge branch 'refs/heads/Calculator'

Conflicts:
	Diabetik/Diabetik-Info.plist