Merge branch 'educational_pricing' into 'master'

Educational pricing change

solves https://dev.gitlab.org/gitlab/organization/issues/17.

Includes:
 - change to subscription page text
 - change to subscription terms
 - blog post

source/_includes/subscription_terms.html

@@ -33,7 +33,7 @@ By purchasing a subscription you agree to be bound by the terms of this document
   <li> <strong>Basic subscription</strong>
   <p>
   The basic subscription allows the client to use GitLab Enterprise Edition with as many users as the subscription is for.
-  A user is defined as an individual authorized by the client to use an on-premises GitLab server.
+  A user is defined as an individual authorized by the client to use an on-premises GitLab server. Students of educational institutions are excluded from the user count.
   This means that a person that has access to two or on-premises servers counts as a single user.
   Robots, bots and other automated accounts not linked to a person do not count towards the user count.
   Guests, reporters, managers and people that have no access to the source code do count towards the user count.
@@ -46,7 +46,7 @@ By purchasing a subscription you agree to be bound by the terms of this document
   The standard subscription entitles the clients to everything the basic subscription offers and the following services.
   GitLab B.V. aims to respond to emergency support questions communicated via the appropriate channel within 30 minutes, 24 hours per day, 365 days per year.
   The number of emergency support questions is not limited.
-  GitLab B.V. will help the client to install and configure GitLab and provide remove assistance during upgrades.
+  GitLab B.V. will help the client to install and configure GitLab and provide remote assistance during upgrades.
   Support for GitLab Continuous Integration (CI) and High Availability (HA) configurations is included with the standard subscription.
   </p>

source/_posts/2014-05-12-students-now-free.markdown

+---
+layout: post
+title: "Subscriptions update: Students do not count as GitLab users anymore"
+date: May 13, 2014
+comments: true
+categories: 
+author: Marc Radulescu
+---
+
+Hello everyone,
+
+Until now, GitLab had been running a special discount for universities. We have decided to change the subscription model, so as to match the needs of educational institutions. 
+
+Starting today, students of educational institutions students are free when ordering user-packs for a subscription.
+
+<!--more-->
+
+GitLab is one of the most easily scalable code collaboration tools out there, and we are in touch with an increasing number of computer science departments that use GitLab for teaching purposes. They want to upgrade their servers to reach out to potentially hundreds or even thousands of students.
+
+However, it becomes apparent that the high variation in the number of students is not a good match with our subscription model. Most universities favor more predictable pricing over per-user pricing, so as to reduce the risk of their subscription bill going through the roof.
+
+We are very excited to see GitLab being used as a tool for students. We believe it shows graduates the importance and power of the open-source mindset. We also believe it's a long-term investment in growing our user base and the product itself.
+
+With that in mind, we have decided to change the subscription model. Starting today:
+
+ * Student users are free when buying a subscription;
+ * The special discount available to universities is deprecated.
+
+As a note, the staff, post-docs and researchers **do** count towards the number of users.
+
+Interested in our proposition? Head over to our [subscription page](http://www.gitlab.com/subscription/) and let's get the collaboration going!

source/subscription/index.html

@@ -86,7 +86,7 @@ title: Subscription
               </p>
               <p>
-              For <b>educational institutions</b> there is a 50% education discount available, please get a quotation and indicate your preferred payment method (credit-card or bank transfer).
+                Students of educational institutions <b>do not count</b> towards the user count. The staff, researchers and post-docs <b>do count</b> towards the user count.
               </p>
               <p>