Merge pull request #1 from ipri2013/master

test1
admin
admin
Merge pull request #5 from juree/master

Admin pages