fix nil cost_price + operator bug
fix a bug on merge! function... it now accept as second argument user even if not used + added add label to locale file en
Merge pull request #1 from maxtavanti/master

fix nil cost_price + operator bug