Admin feature added
Merge branch 'admin'

Merging admin feature.