changes again
Merge branch 'master' of https://github.com/DJTedMoney/Milestone3
fixed client errors