Merge pull request #357 from farismosman/master

[#1540] Handle language translations for dynamic text -- more to come
[#1540] Faris : removed test in export_child_photo_wall.feature