removed dead code of fee calculation
fixed conflicts
Merge branch 'master' of github.com:SOLA-LESOTHO/clients