created new branch
Admin page added
Added Admin page files
merge conflicts with master