Added user to account module
Added account to models
Merge branch 'development'