Create User entity using scaffolding
Create User entity using scaffolding
Merge branch 'develop'
Update rails to 3.2.21 due to javascript issues