Fixed tools model
Merge branch 'master' of https://github.com/rosslazer/codeforgood