Installed factory girl gem
Merge branch 'f_factorygirl' into development