more work on activation done
Merge branch 'feature/activation' of github.com:hef/ps1auth into features/activation
Merge remote-tracking branch 'origin/feature/activation' into features/activation