Fixing appointment bug in convert database script
Merge remote branch 'origin/release' into develop