Version bump (1.1.5)
Version bump (1.1.6.beta)
Bump rails to 3.2.12
Ensure json gem version is at least 1.5.5 [Thanks to Steve Root for
notifying us of this]

Conflicts:
	core/spree_core.gemspec
Remove Mass Assignment of Role IDs
Thanks to Laurens Nienhaus for reporting
Version bump (1.1.6)
Version bump (1.1.7.beta)
Update activemerchant to requiring at least 1.31.x + ransack to 0.7.2