upgrade factory_girl

Conflicts:
	cmd/lib/spree_cmd/templates/extension/extension.gemspec
Merge branch '1-3-stable' into 1-3-cb
ignore load of last incomplete order
add a data hook for card fields
add data hook for default coupon code field
make ajax request for state/country fields
Revert "make ajax request for state/country fields"

This reverts commit e489e6d728a599f90b8e0c11ae8542e1d5228a07.