show page stats
trying to merge
trying to merge
trying to merge
Merge branch 'master' into QA-branch
fixed all tests
changes to show page
lastLogin
Merge pull request #10 from RJFryman/QA-branch

Qa branch