Updated development version of Merchello to 1.2.5