generated users
Merge branch 'shiva96b-master'
fixed routes conflict