minor refactors to make overloading of template vars more easily possible
minor refactors to make overloading of template vars more easily possible

unicefuganda/edtrac,unicefuganda/edtrac,unicefuganda/edtrac