Merge branch 'release/v2.1' into develop
Body Weight Calculator now makes same suggestions re body weight to use as iOS version.
fixed conflicts
starting on syncope risk scores
almost done with SF Syncope Rule
finished Martin Algorithm
refactored SF rule to use simplerisk.xml, deleted syncopesfrule.xml
added Oesil Score
finished EGSYS Score
ready for v2.2
Merge branch 'release/v2.2'