Added bcp map
Merged fro dev
Added more bcp47 maps
Merge branch 'dev' into ms