Merge branch 'master' into travis

Author: Nyholm

src/Resources/config/services.yml

@@ -1,14 +1,16 @@
 services:
   cache.factory.apc:
     class: Cache\AdapterBundle\Factory\ApcFactory
-  cache.factory.uapc:
+  cache.factory.apcu:
     class: Cache\AdapterBundle\Factory\ApcuFactory
   cache.factory.array:
     class: Cache\AdapterBundle\Factory\ArrayFactory
   cache.factory.filesystem:
     class: Cache\AdapterBundle\Factory\FilesystemFactory
   cache.factory.memcached:
     class: Cache\AdapterBundle\Factory\MemcachedFactory
+  cache.factory.memcache:
+    class: Cache\AdapterBundle\Factory\MemcacheFactory
   cache.factory.predis:
     class: Cache\AdapterBundle\Factory\PredisFactory
   cache.factory.redis: