added factorygirl gem + updated spec_helper
added missing Gemfile.lock
Merge pull request #22 from ephe-meral/add-gem-factory-girl

Added factorygirl gem + updated spec_helper
Merge branch 'develop' into develop-ja
added acceptance tests #4