Add factory girl
Merge branch 'develop'