Merge branch 'hotfix/0.0.5'
Removed require statement for Factory Girl
Merge branch 'hotfix/0.0.5.1' into develop