Show trial state in settings view next to plan name

dashboard/src/views/settings.js

@@ -20,7 +20,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
     $scope.availablePlans = [];
     $scope.currentPlan = null;
 
-    $scope.currentSubscription = null;
+    $scope.subscription = null;
 
     // List is from http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
     $scope.s3Regions = [
@@ -600,7 +600,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         AppStore.getSubscription($scope.appstoreConfig, function (error, result) {
             if (error) return console.error(error);
 
-            $scope.currentSubscription = result;
+            $scope.subscription = result;
 
             // check again to give more immediate feedback once a subscription was setup
             if (result.plan.id === 'free') $timeout(getSubscription, 10000);