Changed method accept from users controller to post method
Changes in users controller and tests
Changes in users controller and tests
Changes in users controller and tests
Resolved conflicts
Little code fixes