core changes into mymoney
fix merge