Users

Merge Document model and tests