mergre locales and files into same key begin
mergre locales and files into same key continue
still redesigning
Merge remote-tracking branch 'origin/master'