[Fixed] babies not having (baby) on the end of their name after taming
and storage. 4897

Change-Id: Ibefeb25e8af810ba6ccc69e5a100d69f9a042d28
[Fixed] Removed extra merchant trainer from Theed 4994

Change-Id: Id747a2cff8db55c77ae81d5f5efd03bfdd8656de