admin changes

Admin changes have done according to yesterday meeting
Merge pull request #4 from olaround/master

admin changes