upgrade factory_girl

Conflicts:
	cmd/lib/spree_cmd/templates/extension/extension.gemspec
Merge branch '1-3-stable' into 1-3-cb