Changing lapsed member math to be more accurate & give more info
Merge branch 'pamela' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into pamela