merge latest code

Error: Error creating bean with name userController