Update factory_girl version with deprecated code cleanup

Creating saved instance with `Factory` has been deprecated since factory_girl 3.x.x.
details: http://robots.thoughtbot.com/post/19412394597/factory-girl-hits-3-0
Merge remote-tracking branch 'fujimura/update-deprecated-factory-girl-syntax'

Conflicts:
	Gemfile.lock

Regenerate Gemfile.lock to resolve conflict.
s/Factory/FactoryGirl.create/

See also: a955c2235b3cb3f3da4a08444d6b9560b73b6df7