added basic Devise user
add nickname and superuser fields to User
Merge branch 'feature/admin' into develop