Merge remote-tracking branch 'origin/gui'
[model] Computing of ARV prescriptions indicators added.
Merge remote-tracking branch 'origin/model'