removed redundant loop
remove space from district
add check for replace old national id
Merge branch 'master' of github.com:BaobabHealthTrust/OPD