Change the memcached plugin and store
Merge branch 'master' into new_image

Conflicts:
	Gemfile.lock