merge
Merge branch 'master' of https://github.com/azieroth/CounselorsApprentice.git
endpoints update
endpoints update
Updates to model