added current_location field in flat_table1 and flat_cohort_table
Merge branch 'master' of github.com:BaobabHealthTrust/bart2