OS_28239
Merge branch 'master' of https://github.com/dramosti/Magnificus

Conflicts:
	UI/HLP.UI.Entries/HLP.UI.Entries/Geral/FormPlanoPagamento.resx