Changes in User model and api_controller
Changes in User model and api_controller