finish models and one test
Merge branch 'master' of https://github.com/HyperrealTech/Thorn-Monthly-Dashboard