add locale & data source & some events.
Merge remote-tracking branch 'origin/master'