Merge pull request #241 from Useful-Innovation/johans-fixes

added user to estimates & name on invoice