added functionality for creating users by admin
conflicts resovled