5.4: + Users controller & Rspec test
Merge remote-tracking branch 'origin/master'
6.2: Validate data
6.2: test