Upgraded Merchello to 1.2.0 and manually merged in Lang files.