Working on users ; merge with orders.
Merge conflict fixed. Pay attention to the Gemfile, may create conflicts.