v2.5
Merge branch 'master' of github.com:the-teacher/the_role