pattabhi- modified user controller
pattabhi conflicts resolved: