Update tests for Factory Boy 2.0
Update version to 1.1.0 in preparation for the release
Merge branch 'release/1.1.0' into develop
Merge branch 'feature/factory-boy-2' into develop

Conflicts:
	requirements.txt
	setup.py