Done all admin and client end changes

Done all admin and client end changes
Merge pull request #7 from olaround/master

Done all admin and client end changes