Merge branch 'release/3.0'
Who's paid not showing retired people.
Merge branch 'master' into development