modify _payment partial
update readme.md
update gemspec version
update gemspec
Merge branch '2-1-stable'
add condition of lock_version in spree_users
Merge branch '2-1-stable'