Merge admin & user tables

Merge admin & user tables
Passed the tests : 3 in a row 
http://test.madriguera.me:8080/job/RUN%20TESTS/84/

Some changes need to be done, and check the upgrade goes without problem

osclass-test branch is adminuser