implemented user and admin validation
Merge branch 'master' of https://github.com/shib340/PCNS_Test