coding stuff
fixed merge conflicts when merging with project
many design stuff
Merge branch 'project' into design
added "create user" action
improvements in user creation
extended seeds
merge with design