- added note field to exercise entry
Merge branch 'master' into dev-bluetoothsync
Fixing merge