Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas

Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
	airtime_mvc/application/models/Cache.php

airtime_mvc/application/models/Cache.php

@@ -15,6 +15,7 @@ class Cache
                 $cacheKey = "{$key}{$a}";
         }
 
+<<<<<<< HEAD
         return $cacheKey;
     }
     
@@ -36,3 +37,26 @@ class Cache
         return false;
     }
 }
+=======
+		return $cacheKey;
+	}
+	
+	public function store($key, $value, $isUserValue, $userId = null) {
+		
+		$cacheKey = self::createCacheKey($key, $userId);
+		return apc_store($cacheKey, $value);
+	}
+	
+	public function fetch($key, $isUserValue, $userId = null) {
+		
+		$cacheKey = self::createCacheKey($key, $isUserValue, $userId);
+		return apc_fetch($cacheKey);
+	}
+	
+	public static function clear()
+	{
+	    apc_clear_cache('user');
+	    apc_clear_cache();
+	}
+}
+>>>>>>> cc-5709-airtime-analyzer-buy-now