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)
Freeze to jquery-rails 2.1.4 as jQuery 1.9 breaks a plugin

This port the commit 3e476ba5a07ed0aea0e68b361814269b3b5e4109 from branch 1-2-stable.

Fixes #2646
Fix user autocomplete for admin orders.

Fixes #2655
Merge remote-tracking branch 'upstream/1-1-stable' into HEAD