Merge branch 'master' into touchdown

Conflicts:
	static/js/app.js
	static/partials/organizations.html
	test/data/test.db

static/directives/billing-options.html

@@ -7,10 +7,18 @@
     <div class="panel-body">
       <div class="quay-spinner" ng-show="!currentCard || changingCard"></div>
       <div class="current-card" ng-show="currentCard && !changingCard">
+        <div class="alert alert-warning" ng-if="currentCard.last4 && isExpiringSoon(currentCard)">
+          Your current credit card is expiring soon!
+        </div>
+
         <img ng-src="{{ '/static/img/creditcards/' + getCreditImage(currentCard) }}" ng-show="currentCard.last4">
         <span class="no-card-outline" ng-show="!currentCard.last4"></span>
 
         <span class="last4" ng-show="currentCard.last4">****-****-****-<b>{{ currentCard.last4 }}</b></span>
+        <span class="expires" ng-show="currentCard.last4">
+          {{ currentCard.exp_month }} / {{ currentCard.exp_year }}
+        </span>
+
         <span class="not-found" ng-show="!currentCard.last4">No credit card found</span>
       </div>
 

static/directives/header-bar.html

@@ -29,7 +29,7 @@
       </form>
       
       <span class="navbar-left user-tools" ng-show="!user.anonymous">
-        <a href="/new/"><i class="fa fa-upload user-tool" bs-tooltip="tooltip.title" data-placement="bottom" data-title="Create new repository"></i></a>
+        <a href="/new/"><i class="fa fa-upload user-tool" bs-tooltip="tooltip.title" data-placement="bottom" data-title="Create new repository" data-container="body"></i></a>
       </span>
     </li>
 

static/directives/tour-content.html

@@ -216,7 +216,7 @@
         Create New Organization
       </button>
     </a>
-    <a href="/user/?migrate" ng-show="!user.anonymous" data-title="Starts the process to convert this account into an organization" bs-tooltip="tooltip.title">
+    <a href="/user/?migrate" data-title="Starts the process to convert this account into an organization" quay-show="Config.AUTHENTICATION_TYPE == 'Database' && !user.anonymous" bs-tooltip="tooltip.title">
       <button class="btn btn-primary">
         Convert account now
       </button>