Added yml manager to save translation in yml
Merge remote-tracking branch 'origin/master'