[fix] change before block in states spec
[model] add city to be validated for presence
[model] change right association forein and primary keys for states
[spec/model] make test pending because of missing attribute
[spec/model] checking presence of  country_iso attribute in states
[styling] remove empty line
Merge branch 'rails4' into rails4_fix_model_specs

Conflicts:
	core/spec/models/address_spec.rb