Added skeleton user models
Merged remote with local