Merge pull request #1 from smillie/master

Bug #46: Fix user expiry date calculation
Fixing routing regex to allow '-' character in group names