added admin authentication
merge conflicts