#12 Adaptar FireSale
Merge remote-tracking branch 'origin/1.0/develop' into 1.0/develop