...
Merge pull request #6 from henb/005-add-roles-to-users

005 add roles to users
Merge pull request #1 from henb/develop

Develop
Merge branch 'develop'
edit factories
Merge branch 'develop'
Delete no use files
Update .gitignore
Create examples for config
Create examples for config
Review routes
Review settings
Delete no use files
Update .rspec
Remove no use tests
Delete .keep files
Remove no use tests
Delete .keep files
Update tests
Update files