Added gem 'zeus'
New factories
Little changes
all tests passed
Merge branch 'feature/tests' into develop
all tests passed