Simple user spec.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Add tests for user and dashboard