fix the last failed spec + use the first rc of the custom_fields gem (2.4.0)
Merge branch 'rails_4' into rails_4.1.4

Conflicts:
	Gemfile.lock
switch on locale custom_fields gem version
FIX changed of ActiveSupport Json API
Add trace