[MOD] Changes proposed in Meeting 15-12-2017

Merged Reviewer Intergaláctico requested to merge 7.0-MOD_Purchase_Changes_12_2017 into 7.0-stage

Merge request reports