diff --git a/app/locale/ar.coffee b/app/locale/ar.coffee
index 95c0c00c6..718386713 100644
--- a/app/locale/ar.coffee
+++ b/app/locale/ar.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "إحفض نسخة جديدة"
     new_major_version: "نسخة مهمّة جديدة"
diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee
index 855874b22..84743619a 100644
--- a/app/locale/bg.coffee
+++ b/app/locale/bg.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "български език", englishDescri
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "български език", englishDescri
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
 #  versions:
 #    save_version_title: "Save New Version"
 #    new_major_version: "New Major Version"
diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee
index 0ef3e0134..10ecb6bc8 100644
--- a/app/locale/ca.coffee
+++ b/app/locale/ca.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Guarda una nova versió"
     new_major_version: "Nova versió principal"
diff --git a/app/locale/cs.coffee b/app/locale/cs.coffee
index 88f1962e3..616ff15ef 100644
--- a/app/locale/cs.coffee
+++ b/app/locale/cs.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     sys_requirements_1: "Protože CodeCombat je hra, pro počítače je to více náročnější než přehrávání videa. Optimalizovali jsme CodeCombat, aby běžel rychle na všech moderních prohlížečích a dokonce i na starších mašinách, takže každý může hrát. Takže tady jsou naše návrhy, jak si co nejvíce užít váš Hour of Code zážitek:" # {change}
     sys_requirements_2: "Používejte nejnovější verzi Chromu nebo Firefoxu." # {change}
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Uložit novou verzi"
     new_major_version: "Nová hlavní verze"
diff --git a/app/locale/da.coffee b/app/locale/da.coffee
index 432392081..b77ff758c 100644
--- a/app/locale/da.coffee
+++ b/app/locale/da.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Gem ny version"
     new_major_version: "Ny hoved Version"
diff --git a/app/locale/de-AT.coffee b/app/locale/de-AT.coffee
index c3f79ef5b..13678a31f 100644
--- a/app/locale/de-AT.coffee
+++ b/app/locale/de-AT.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Neue Version speichern"
     new_major_version: "Neue Hauptversion"
diff --git a/app/locale/de-CH.coffee b/app/locale/de-CH.coffee
index 3e6f29dad..5b03c9bf1 100644
--- a/app/locale/de-CH.coffee
+++ b/app/locale/de-CH.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Neui Version speichere"
     new_major_version: "Neui Hauptversion"
diff --git a/app/locale/de-DE.coffee b/app/locale/de-DE.coffee
index c88f974c7..615f5b495 100644
--- a/app/locale/de-DE.coffee
+++ b/app/locale/de-DE.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
     sys_requirements_2: "Nutzen Sie die neuesten Versionen von Google Chrome oder Firefox." # {change}
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Neue Version speichern"
     new_major_version: "Neue Hauptversion"
diff --git a/app/locale/el.coffee b/app/locale/el.coffee
index 2cad2987e..8aed7638f 100644
--- a/app/locale/el.coffee
+++ b/app/locale/el.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Αποθήκευση Νέας Έκδοσης"
     new_major_version: "Δημιουργία Νέας Έκδοσης"
diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee
index f1cea2900..37b880edf 100644
--- a/app/locale/en-GB.coffee
+++ b/app/locale/en-GB.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
 #  versions:
 #    save_version_title: "Save New Version"
 #    new_major_version: "New Major Version"
diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee
index e975692aa..cb5f6a342 100644
--- a/app/locale/en-US.coffee
+++ b/app/locale/en-US.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
 #  versions:
 #    save_version_title: "Save New Version"
 #    new_major_version: "New Major Version"
diff --git a/app/locale/en.coffee b/app/locale/en.coffee
index 50b5328cf..d49a4ee26 100644
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@@ -597,11 +597,11 @@
     intro_2: "No experience required!"
     free_title: "How much does it cost?"
     cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-    free_1: "There are 80+ FREE levels which cover every concept." # {change}
+    free_1: "There are 80+ FREE levels which cover every concept."
     free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
     teacher_subs_title: "Teachers get free subscriptions!"
-    teacher_subs_1: "Please fill out our" # {change}
-    teacher_subs_2: "Teacher Survey" # {change}
+    teacher_subs_1: "Please fill out our"
+    teacher_subs_2: "Teacher Survey"
     teacher_subs_3: "to set up your subscription."
     sub_includes_title: "What is included in the subscription?"
     sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
@@ -647,12 +647,12 @@
     must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
     retrieving: "Retrieving information..."
     being_reviewed_1: "Your application for a free trial subscription is being"
-    being_reviewed_2: "reviewed"
+    being_reviewed_2: "reviewed." # {change}
     approved_1: "Your application for a free trial subscription was"
-    approved_2: "approved."
+    approved_2: "approved." # {change}
     approved_3: "Further instructions have been sent to"
     denied_1: "Your application for a free trial subscription has been"
-    denied_2: "denied"
+    denied_2: "denied." # {change}
     contact_1: "Please contact"
     contact_2: "if you have further questions."
     description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -660,7 +660,8 @@
     description_3: "page."
     description_4: "Please fill out this quick survey and we’ll email you setup instructions."
     email: "Email Address"
-    school_city: "Name of School, City"
+    school: "Name of School"
+    location: "Name of City"
     age_students: "How old are your students?"
     under: "Under"
     other: "Other:"
diff --git a/app/locale/eo.coffee b/app/locale/eo.coffee
index 375bbba2b..3cec1d64b 100644
--- a/app/locale/eo.coffee
+++ b/app/locale/eo.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
 #  versions:
 #    save_version_title: "Save New Version"
 #    new_major_version: "New Major Version"
diff --git a/app/locale/es-419.coffee b/app/locale/es-419.coffee
index 88b3de093..20330e441 100644
--- a/app/locale/es-419.coffee
+++ b/app/locale/es-419.coffee
@@ -599,8 +599,9 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     free_1: "CodeCombat Basic es GRATIS! Hay 70+ niveles gratis que cubren cada concepto." # {change}
     free_2: "Una suscripción mensual le da acceso a tutoriales en vídeo y niveles extra para practicar."
     teacher_subs_title: "¡Los amestros obtienen subscripciones gratuitas!"
-    teacher_subs_1: "Por favor contacte"
-    teacher_subs_2: "para configurar una suscripción mensual gratis."
+    teacher_subs_1: "Por favor contacte" # {change}
+    teacher_subs_2: "para configurar una suscripción mensual gratis." # {change}
+#    teacher_subs_3: "to set up your subscription."
     sub_includes_title: "¿Qué se incluye en la suscripción?"
     sub_includes_1: "Adicionalmente a los más de 70 niveles básicos, los estudiantes con una suscripción mensual obtienen acceso a estas características adicionales:" # {change}
     sub_includes_2: "Más de 40 niveles de práctica" # {change}
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     sys_requirements_1: "Debido que CodeCombat es un juego, es más difícil para las computadoras correrlo en relación a un tutorial escrito o un video. Para que todos puedan jugar, hemos optimizado la web para correr rápidamente en todos los navegadores modernos y en maquinas antiguas. Dicho esto, aquí están nuestras sugerencias para sacar el máximo provecho de su experiencia en la Hora del Código:" # {change}
     sys_requirements_2: "Usar una versión actualizada del navegador Chrome o Firefox." # {change}
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Guardar nueva versión"
     new_major_version: "Nueva Gran Versión"
diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee
index 10fc50db7..2af62a888 100644
--- a/app/locale/es-ES.coffee
+++ b/app/locale/es-ES.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Guardar nueva versión"
     new_major_version: "Nueva versión principal"
diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee
index ee8166ae1..fe6cb9b4c 100644
--- a/app/locale/fa.coffee
+++ b/app/locale/fa.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "ذخیره کردن نسخه جدید"
     new_major_version: "New Major Version"
diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee
index 04b68bd23..0e439f03a 100644
--- a/app/locale/fi.coffee
+++ b/app/locale/fi.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
 #  versions:
 #    save_version_title: "Save New Version"
 #    new_major_version: "New Major Version"
diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee
index ffd043025..2ffc2cd48 100644
--- a/app/locale/fr.coffee
+++ b/app/locale/fr.coffee
@@ -599,8 +599,9 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     free_1: "La version de base de CodeCombat est gratuite ! Il y a 70+ niveaux gratuits qui couvrent chaque concepts." # {change}
     free_2: "Un abonnement mensuel fournit l'accès à des vidéos de tutoriels ainsi qu'à des niveaux d'entraînement supplémentaires."
     teacher_subs_title: "Les enseignants reçoivent un abonnement gratuit !"
-    teacher_subs_1: "Merci de nous contacter"
-    teacher_subs_2: "pour obtenir un abonnement mensuel gratuit."
+    teacher_subs_1: "Merci de nous contacter" # {change}
+    teacher_subs_2: "pour obtenir un abonnement mensuel gratuit." # {change}
+#    teacher_subs_3: "to set up your subscription."
     sub_includes_title: "Qu'y a t-il d'inclus dans cet abonnement ?"
     sub_includes_1: "En plus des 70+ niveaux de base, les élèves avec un abonnement mensuel ont accès à ces fonctionnalités supplémentaires :" # {change}
     sub_includes_2: "40+ niveaux d'entrainement" # {change}
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     sys_requirements_1: "Un navigateur moderne. La dernière version de Chrome, Firefox, ou de Safari. Internet Explorer 9 ou plus récent."
     sys_requirements_2: "CodeCombat n'est pas encore supporté sur iPad."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Enregistrer une nouvelle version"
     new_major_version: "Nouvelle version majeure"
@@ -1381,7 +1409,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     filter_results: "Résultats"
     start_hiring: "Commencer à embaucher."
     reasons: "Trois raisons pour lesquelles vous devriez employer vos prochains employés avec nous."
-    everyone_looking:"Toutes les personnes ici sont en quête de leur nouvel emploi."
+    everyone_looking: "Toutes les personnes ici sont en quête de leur nouvel emploi."
     everyone_looking_blurb: "Oubliez environ 20% du taux de réponse de courriels Linkedin. Toutes les personnes que nous avons listé sur ce site veulent être trouvé pour un nouvel emploi et répondront à votre requête pour qu'ils puissent s'introduire."
     weeding: "Soyez tranquille, nous avons effectué une première sélection pour vous."
     weeding_blurb: "Tous les joueurs que nous avons listés ont été sélectionné pour leurs abilités techniques. Nous allons également effectuer des entrevues techniques au téléphone pour sélectionner les candidats et ajouter des notes à leurs profiles afin de vous sauver du temps."
diff --git a/app/locale/gl.coffee b/app/locale/gl.coffee
index 188712327..1dc4ffa7a 100644
--- a/app/locale/gl.coffee
+++ b/app/locale/gl.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Gardar nova versión"
     new_major_version: "Nova versión principal"
diff --git a/app/locale/he.coffee b/app/locale/he.coffee
index 8b844082f..2b3a8f306 100644
--- a/app/locale/he.coffee
+++ b/app/locale/he.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "שמור גרסה חדשה"
     new_major_version: "גרסה חשובה חדשה"
diff --git a/app/locale/hi.coffee b/app/locale/hi.coffee
index 349471f62..0e4f9b8ba 100644
--- a/app/locale/hi.coffee
+++ b/app/locale/hi.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
 #  versions:
 #    save_version_title: "Save New Version"
 #    new_major_version: "New Major Version"
diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee
index 6f62c18e2..e74113b6f 100644
--- a/app/locale/hu.coffee
+++ b/app/locale/hu.coffee
@@ -599,8 +599,9 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     free_1: "CodeCombat Basic INGYENES! 70-nél is több pálya, amely minden tudást megad." # {change}
     free_2: "A havidíjas előfizetés hozzáférést biztosít az oktató videókhoz és az extra gyakoroló pályákhoz."
     teacher_subs_title: "Tanárok ingyenes előfizetést kapnak!"
-    teacher_subs_1: "Lépjen kapcsolatba velünk,"
-    teacher_subs_2: "hogy megkapja az ingyenes havi előfizetést."
+    teacher_subs_1: "Lépjen kapcsolatba velünk," # {change}
+    teacher_subs_2: "hogy megkapja az ingyenes havi előfizetést." # {change}
+#    teacher_subs_3: "to set up your subscription."
     sub_includes_title: "Mit tartalmaz az előfizetés?"
     sub_includes_1: "A 80+ alap pályán kívül az előfizetéssel rendelkező tanulók az alábbi extrákhoz férnek hozzá:"
     sub_includes_2: "50+ gyakorló pálya" # {change}
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     sys_requirements_1: "Egy modern web-böngésző. Újabb verziójú Chrome, Firefox, vagy Safari, illetve Internet Explorer 9 vagy újabb."
     sys_requirements_2: "CodeCombat még nem támogatott iPad-en."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Új verzió mentése"
     new_major_version: "Új főverzió"
diff --git a/app/locale/id.coffee b/app/locale/id.coffee
index 234cca132..a34620738 100644
--- a/app/locale/id.coffee
+++ b/app/locale/id.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
 #  versions:
 #    save_version_title: "Save New Version"
 #    new_major_version: "New Major Version"
diff --git a/app/locale/it.coffee b/app/locale/it.coffee
index 199ed27d0..2631fc4b3 100644
--- a/app/locale/it.coffee
+++ b/app/locale/it.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Salva nuova versione"
     new_major_version: "Nuova versione"
diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee
index d4f832caf..191c2aa84 100644
--- a/app/locale/ja.coffee
+++ b/app/locale/ja.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     intro_2: "プログラミングの経験は必要ありません！"
     free_title: "価格について"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-    free_1: "CodeCombat は基本的に無料です！80以上のレベルが無料です。"
+    free_1: "CodeCombat は基本的に無料です！80以上のレベルが無料です。" # {change}
     free_2: "月々の課金をするとビデオのチュートリアルにアクセスでき、また追加のレベルが楽しめます。"
     teacher_subs_title: "教育関係者は無料のサブスクリプションを得ることができます！"
-    teacher_subs_1: ""
-    teacher_subs_2: "に連絡して無料の月々のサブスクリプションを得ましょう。"
+    teacher_subs_1: "" # {change}
+    teacher_subs_2: "に連絡して無料の月々のサブスクリプションを得ましょう。" # {change}
+#    teacher_subs_3: "to set up your subscription."
     sub_includes_title: "サブスクリプションの内容について"
     sub_includes_1: "70以上の基本レベルに加えて、生徒は月々のサブスクリプションを得て次の機能が使えます:" # {change}
     sub_includes_2: "40以上の練習レベル" # {change}
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     sys_requirements_1: "モダンなブラウザ。最新の Chrome や FireFox, Safari など。Internet Explorer 9 以上。"
     sys_requirements_2: "CodeCombat はまだ iPad をサポートしていません。"
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "新しいバージョンをセーブ"
     new_major_version: "メジャーバージョンを新しくする"
diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee
index b4298e123..f4b7fd349 100644
--- a/app/locale/ko.coffee
+++ b/app/locale/ko.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "새로운 버전을 저장합니다"
     new_major_version: "신규 버전"
diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee
index 00d55531a..51f0c7eee 100644
--- a/app/locale/lt.coffee
+++ b/app/locale/lt.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
 #  versions:
 #    save_version_title: "Save New Version"
 #    new_major_version: "New Major Version"
diff --git a/app/locale/mk-MK.coffee b/app/locale/mk-MK.coffee
index 8fb265566..ddd5ffdac 100644
--- a/app/locale/mk-MK.coffee
+++ b/app/locale/mk-MK.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Зачувај нова верзија"
     new_major_version: "Нова поголема(major) верзија"
diff --git a/app/locale/ms.coffee b/app/locale/ms.coffee
index d61290a5c..868b7e182 100644
--- a/app/locale/ms.coffee
+++ b/app/locale/ms.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Simpan versi baru"
     new_major_version: "Versi utama yang baru"
diff --git a/app/locale/nb.coffee b/app/locale/nb.coffee
index 2ffb27f2a..e88a23406 100644
--- a/app/locale/nb.coffee
+++ b/app/locale/nb.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     sys_requirements_1: "Siden CodeCombat er et spill, er det mer intensivt for datamaskiner å kjøre jevnt enn opplæringsvideo eller -tekst. Vi har optimert det for å kjøre raskt på alle moderne nettlesere, og på eldre maskiner slik at alle kan spille. Når det er sagt, her følger våre anbefalinger for å gå mest ut av din Hour of Code:" # {change}
     sys_requirements_2: "Bruk nye versjoner av Chrome eller Firefox." # {change}
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Lagre ny version"
     new_major_version: "Ny hovedversjon"
diff --git a/app/locale/nl-BE.coffee b/app/locale/nl-BE.coffee
index 6360e6320..d4b2572bc 100644
--- a/app/locale/nl-BE.coffee
+++ b/app/locale/nl-BE.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Nieuwe versie opslaan"
     new_major_version: "Nieuwe hoofd versie"
diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee
index 031abe296..3d454ae41 100644
--- a/app/locale/nl-NL.coffee
+++ b/app/locale/nl-NL.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Nieuwe versie opslaan"
     new_major_version: "Nieuwe hoofd versie"
diff --git a/app/locale/nn.coffee b/app/locale/nn.coffee
index ec0305d8b..78a063d00 100644
--- a/app/locale/nn.coffee
+++ b/app/locale/nn.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
 #  versions:
 #    save_version_title: "Save New Version"
 #    new_major_version: "New Major Version"
diff --git a/app/locale/pl.coffee b/app/locale/pl.coffee
index 8c7a90b1f..32d21040a 100644
--- a/app/locale/pl.coffee
+++ b/app/locale/pl.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Zapisz nową wersję"
     new_major_version: "Nowa wersja główna"
diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee
index e63bbef1f..8a06b5748 100644
--- a/app/locale/pt-BR.coffee
+++ b/app/locale/pt-BR.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     intro_2: "Não é necessário ter experiência!"
     free_title: "Quanto custa?"
     cost_china: "CodeCombat na China é gratuito para os primeiros cinco níveis, depois disso o valor mensal para ter acesso a mais de 140 níveis nos nossos servidores exclusivos na China é de $9.99 dólares americanos."
-    free_1: "CodeCombat Basic é gratuito! Há mais de 80 níveis gratuitos que cobrem todos os conceitos."
+    free_1: "CodeCombat Basic é gratuito! Há mais de 80 níveis gratuitos que cobrem todos os conceitos." # {change}
     free_2: "Uma assinatura mensal dá acesso aos vídeos tutoriais e mais níveis para praticar."
     teacher_subs_title: "Professores recebem assinaturas gratuitas!"
-    teacher_subs_1: "Por favor contate"
-    teacher_subs_2: "para organizar uma assinatura mensal."
+    teacher_subs_1: "Por favor contate" # {change}
+    teacher_subs_2: "para organizar uma assinatura mensal." # {change}
+#    teacher_subs_3: "to set up your subscription."
     sub_includes_title: "O que está incluído na assinatura?"
     sub_includes_1: "Além dos mais de 80 níveis básicos, estudantes com uma assinatura mensal têm acesso aos seguintes recursos:"
     sub_includes_2: "Mais de 60 níveis para praticar"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     sys_requirements_1: "Pelo motivo de CodeCombat ser um jogo, é mais intenso para ser processado em computadores do que tutoriais em vídeo ou escritos. Estamos otimizando para que rode rapidamente em todos navegadores modernos e também em computadores antigos, assim todos podem jogar. Sendo assim, aqui estão as nossas sugestões para tirar o máximo proveito da experiência de CodeCombat:" # {change}
     sys_requirements_2: "Use versões novas dos navegadores Chrome ou Firefox." # {change}
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Salvar nova versão"
     new_major_version: "Nova versão principal"
diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee
index 3ae3ac08c..381843f04 100644
--- a/app/locale/pt-PT.coffee
+++ b/app/locale/pt-PT.coffee
@@ -301,7 +301,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     infinite_loop_reset_level: "Reiniciar Nível"
     infinite_loop_comment_out: "Comentar o Meu Código"
     tip_toggle_play: "Alterna entre Jogar e Pausar com Ctrl+P."
-    tip_scrub_shortcut: "Ctrl+[ rebobina e Ctrl+] avança." # {change}
+    tip_scrub_shortcut: "Usa Ctrl+[ para rebobinar e Ctrl+] para avançar."
     tip_guide_exists: "Clica no guia, dentro do menu do jogo (no topo da página), para informações úteis."
     tip_open_source: "O CodeCombat é 100% open source!"
     tip_beta_launch: "O CodeCombat lançou o seu beta em outubro de 2013."
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     intro_2: "Não é necessário ter experiência!"
     free_title: "Quanto custa?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
     teacher_subs_title: "Os professores recebem uma subscrição gratuita!"
-    teacher_subs_1: "Por favor, contacta"
-    teacher_subs_2: "para te arranjarmos uma subscrição mensal gratuita."
+    teacher_subs_1: "Por favor, preenche o nosso"
+    teacher_subs_2: "Inquérito para Professores"
+    teacher_subs_3: "para configurares a tua subscrição."
     sub_includes_title: "O que está incluído na subscrição?"
     sub_includes_1: "Para além dos 80+ níveis básicos, os estudantes com uma subscrição mensal têm acesso às seguintes funcionalidades adicionais:"
     sub_includes_2: "60+ níveis para praticar"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     sys_requirements_1: "Um navegador moderno. As versões mais recentes do Chrome, Firefox ou Safari. Internet Explorer 9 ou mais recente."
     sys_requirements_2: "O CodeCombat ainda não é suportado em iPad's."
 
+  teachers_survey:
+    title: "Inquérito para Professores"
+    must_be_logged: "Primeiro tens de ter sessão iniciada. Por favor, cria uma conta ou inicia sessão a partir do menu acima."
+    retrieving: "A recolher informações..."
+    being_reviewed_1: "A tua aplicação para uma subscrição de avaliação gratuita está a ser"
+    being_reviewed_2: "revista"
+    approved_1: "A tua aplicação para uma subscrição de avaliação gratuita foi"
+    approved_2: "aprovada"
+    approved_3: "Mais instruções foram enviadas para"
+    denied_1: "A tua aplicação para uma subscrição de avaliação gratuita foi"
+    denied_2: "recusada"
+    contact_1: "Por favor, contacta"
+    contact_2: "se tiveres mais questões."
+    description_1: "Oferecemos subscrições gratuitas a professores para efeitos de avaliação. Podes encontar mais informações na nossa página de"
+    description_2: "professores"
+    description_3: "."
+    description_4: "Por favor, preenche este pequeno inquérito e nós enviar-te-emos, por e-mail, as instruções de configuração."
+    email: "Endereço de E-mail"
+    school_city: "Nome da Escola, Cidade"
+    age_students: "Que idade têm os teus alunos?"
+    under: "Menos de"
+    other: "Outra:"
+    amount_students: "Quantos alunos ensinas?"
+    hear_about: "Como ouviste falar do CodeCombat?"
+    fill_fields: "Por favor, preenche todos os campos."
+    thanks: "Obrigado! Vamos enviar-te as instruções de configuração em breve."
+
   versions:
     save_version_title: "Guardar Nova Versão"
     new_major_version: "Nova Versão Principal"
diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee
index ee5cf2172..748b732c5 100644
--- a/app/locale/ro.coffee
+++ b/app/locale/ro.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Salvează noua versiune"
     new_major_version: "Versiune nouă majoră"
diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee
index 68334bc94..1c732899b 100644
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     intro_2: "Опыт не обязателен!"
     free_title: "Сколько это стоит?"
     cost_china: "Первые 5 уровней CodeCombat бесплатны в Китае. При оплате $9.99 в месяц вы получите доступ к последующим более чем 140 уровням на наших эксклюзивных серверах в Китае."
-    free_1: "CodeCombat (его базовая часть) бесплатен! В наличии более 80 уровней, которые покрывают каждый концепт."
+    free_1: "CodeCombat (его базовая часть) бесплатен! В наличии более 80 уровней, которые покрывают каждый концепт." # {change}
     free_2: "Месячная подписка предоставляет доступ к видео-урокам и дополнительным уровням."
     teacher_subs_title: "Учителя получают бесплатные подписки!"
-    teacher_subs_1: "Пожалуйста, напишите на"
-    teacher_subs_2: "для получения бесплатной месячной подписки."
+    teacher_subs_1: "Пожалуйста, напишите на" # {change}
+    teacher_subs_2: "для получения бесплатной месячной подписки." # {change}
+#    teacher_subs_3: "to set up your subscription."
     sub_includes_title: "Что включено в подписку?"
     sub_includes_1: "В дополнение к более чем 80 бесплатным уровням ученики с месячной подпиской получат доступ к дополнительным возможностям:"
     sub_includes_2: "Более 60 уровней для дополнительной практики"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     sys_requirements_1: "Современный веб-браузер. Последние версии Chrome, Firefox или Safari. Internet Explorer 9 или новее."
     sys_requirements_2: "CodeCombat пока не доступен на iPad."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Сохранить новую версию"
     new_major_version: "Новая основная версия"
diff --git a/app/locale/sk.coffee b/app/locale/sk.coffee
index 52b31fc54..74e54b9e5 100644
--- a/app/locale/sk.coffee
+++ b/app/locale/sk.coffee
@@ -599,8 +599,9 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     free_1: "CodeCombat Basic is ZDARMA ! K dispozícii je 70+ úrovní pokrývajúcich každý koncept." # {change}
     free_2: "Mesačné predplatné poskytuje prístup k videonávodom a k úrovniam na precvičenie navyše."
     teacher_subs_title: "Pre učiteľov je predplatné zdarma !"
-    teacher_subs_1: "Napíšte na"
-    teacher_subs_2: "pre zriadenie mesačného predplatného zdarma."
+    teacher_subs_1: "Napíšte na" # {change}
+    teacher_subs_2: "pre zriadenie mesačného predplatného zdarma." # {change}
+#    teacher_subs_3: "to set up your subscription."
     sub_includes_title: "Čo zahrnuje predplatné ?"
     sub_includes_1: "Študenti s mesačným predplatným získajú ku 70+ základným úrovniam  aj :" # {change}
     sub_includes_2: "40+ tréningových úrovní" # {change}
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     sys_requirements_1: "Moderný webový prehliadač. Nové verzie prehliadačov Chrome, Firefox alebo Safari. Internet Explorer 9 alebo novší."
     sys_requirements_2: "CodeCombat nie je zatiaľ podprovaný pre iPad."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Ulož novú verziu"
     new_major_version: "Nová primárna verzia"
diff --git a/app/locale/sl.coffee b/app/locale/sl.coffee
index 5bc9588f7..050bc953e 100644
--- a/app/locale/sl.coffee
+++ b/app/locale/sl.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
 #  versions:
 #    save_version_title: "Save New Version"
 #    new_major_version: "New Major Version"
diff --git a/app/locale/sr.coffee b/app/locale/sr.coffee
index d84abdd35..7863a43e2 100644
--- a/app/locale/sr.coffee
+++ b/app/locale/sr.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
 #  versions:
 #    save_version_title: "Save New Version"
 #    new_major_version: "New Major Version"
diff --git a/app/locale/sv.coffee b/app/locale/sv.coffee
index ddfcdcb4e..ae7f9f260 100644
--- a/app/locale/sv.coffee
+++ b/app/locale/sv.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     intro_2: "Ingen erfarenhet krävs!"
     free_title: "Hur mycket kostar det?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-    free_1: "CodeCombat Basic är GRATIS! Det finns över 80 gratis nivåer som täcker alla koncept."
+    free_1: "CodeCombat Basic är GRATIS! Det finns över 80 gratis nivåer som täcker alla koncept." # {change}
     free_2: "En månadsprenumeration ger tillgång till videogenomgångar och fler övningsnivåer."
     teacher_subs_title: "Lärare får gratis prenumerationer!"
-    teacher_subs_1: "Kontakta"
-    teacher_subs_2: "för att sätta upp en gratis månadsprenumeration."
+    teacher_subs_1: "Kontakta" # {change}
+    teacher_subs_2: "för att sätta upp en gratis månadsprenumeration." # {change}
+#    teacher_subs_3: "to set up your subscription."
     sub_includes_title: "Vad ingår i prenumerationen?"
     sub_includes_1: "Förutom de 80+ grundläggande nivåerna får elever med en månadsprenumeration tillgång till följande:"
     sub_includes_2: "60+ övningsnivåer"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     sys_requirements_1: "En modern webbläsare. Nyare versioner av Chrome, Firefox, eller Safari. Internet Explorer 9 eller senare."
     sys_requirements_2: "CodeCombat stöds inte på iPad än."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Spara ny version"
     new_major_version: "Ny betydande version"
diff --git a/app/locale/th.coffee b/app/locale/th.coffee
index 6eccf6136..3d8cf41c7 100644
--- a/app/locale/th.coffee
+++ b/app/locale/th.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
 #  versions:
 #    save_version_title: "Save New Version"
 #    new_major_version: "New Major Version"
diff --git a/app/locale/tr.coffee b/app/locale/tr.coffee
index f78ff405b..da4641f27 100644
--- a/app/locale/tr.coffee
+++ b/app/locale/tr.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Yeni Sürümü Kaydet"
     new_major_version: "Yeni Önemli Sürüm"
diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee
index 439d6087a..2944fc5ba 100644
--- a/app/locale/uk.coffee
+++ b/app/locale/uk.coffee
@@ -263,7 +263,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     victory_experience_gained: "Отриманий досвід"
     victory_gems_gained: "Отримані самоцвіти"
     victory_new_item: "Новий предмет"
-#    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
+    victory_viking_code_school: "Оце так! Це був важкий рівень, але Ви справились! Якщо Ви ще не розробник програмного забезпечення, Вам слід вже бути. Ви щойно пройшли швидку процедуру прийняття у Viking Code School, де Ви матимете змогу удосконалити Ваші навички до наступного рівня та стати професійним веб-розробником за 14 тижнів."
     victory_become_a_viking: "Стати вікінгом"
     guide_title: "Посібник"
     tome_minion_spells: "Заклинання Ваших міньонів" # Only in old-style levels.
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    intro_2: "No experience required!"
     free_title: "Скільки це коштує?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Українська", englishDescription:
     sys_requirements_1: "Оскільки CodeCombat — це гра, для нормальної роботи він вимагає у комп'ютерів більше, ніж відео чи текстові посібники. Ми оптимізували його для швидкої роботи в усіх сучасних браузерах і на старіших машинах, щоб кожен міг грати. І ось наші підказки, як отримати від CodeCombat якнайбільше:" # {change}
     sys_requirements_2: "Використовуйте новіші версії Chrome або Firefox." # {change}
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Зберегти нову версію"
     new_major_version: "Зберегти основну версію"
@@ -1011,7 +1039,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     log_in_for_friends: "Увійдіть та грайте за своїх друзів!"
     social_connect_blurb: "Приєднайтесь та грайте проти Ваших друзів!"
     invite_friends_to_battle: "Запросіть своїх друзів приєднатися до Вас у бою!"
-    fight: "В бій!"
+    fight: "У бій!"
     watch_victory: "Подивитись Вашу перемогу"
     defeat_the: "Перемогти"
 #    tournament_started: ", started"
diff --git a/app/locale/ur.coffee b/app/locale/ur.coffee
index be6f1cc21..884d4582a 100644
--- a/app/locale/ur.coffee
+++ b/app/locale/ur.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
 #  versions:
 #    save_version_title: "Save New Version"
 #    new_major_version: "New Major Version"
diff --git a/app/locale/uz.coffee b/app/locale/uz.coffee
index 8c8009fda..939e9d25e 100644
--- a/app/locale/uz.coffee
+++ b/app/locale/uz.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
 #  versions:
 #    save_version_title: "Save New Version"
 #    new_major_version: "New Major Version"
diff --git a/app/locale/vi.coffee b/app/locale/vi.coffee
index b42de0564..7b6397cb3 100644
--- a/app/locale/vi.coffee
+++ b/app/locale/vi.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
     sys_requirements_2: "Hãy sử dụng phiên bản mới nhất của Chrome hoặc Firefox." # {change}
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "Lưu Phiên bản Mới"
     new_major_version: "Phiên bản chính mới"
diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index d906b145f..14c84736d 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     intro_2: "无需经验!"
     free_title: "要多少钱?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
     teacher_subs_title: "教师可免费订阅!"
-    teacher_subs_1: "请联系"
-#    teacher_subs_2: "to set up a free monthly subscription."
+    teacher_subs_1: "请联系" # {change}
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
     sub_includes_2: "超过60个练习关卡"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     sys_requirements_1: "因为CodeCombat是个游戏，它对于电脑的要求很高以运行的顺畅。我们已经优化过他以便让他能在每一个最新浏览器或是比较旧的电脑跑得顺畅，所以每一个人都能享受CodeCombat带来的乐趣。如上，为了使你顺利的完成Hour of Code的学习，我们建议你：" # {change}
     sys_requirements_2: "使用最新版本的Chrome或是Firefox." # {change}
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "保存新版本"
     new_major_version: "新的重要版本"
diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee
index 8aae98961..928fe2c21 100644
--- a/app/locale/zh-HANT.coffee
+++ b/app/locale/zh-HANT.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     sys_requirements_1: "因為CodeCombat是遊戲, 相比播放影片它讓電腦花費更多資源去順暢的執行. 為了讓所有人都可以接觸，我們已經讓它在現在的瀏覽器和老舊的電腦上執行最佳化. 以下是我們為了讓您順暢體驗Hour of Code所給的系統建議:" # {change}
     sys_requirements_2: "使用較新的Chrome or Firefox版本." # {change}
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "保存新版本"
     new_major_version: "新的重要版本"
diff --git a/app/locale/zh-WUU-HANS.coffee b/app/locale/zh-WUU-HANS.coffee
index 29e605af2..a455159e8 100644
--- a/app/locale/zh-WUU-HANS.coffee
+++ b/app/locale/zh-WUU-HANS.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
 #  versions:
 #    save_version_title: "Save New Version"
 #    new_major_version: "New Major Version"
diff --git a/app/locale/zh-WUU-HANT.coffee b/app/locale/zh-WUU-HANT.coffee
index b64a9c370..5f4fda86e 100644
--- a/app/locale/zh-WUU-HANT.coffee
+++ b/app/locale/zh-WUU-HANT.coffee
@@ -596,11 +596,12 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
+#    free_1: "There are 80+ FREE levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please contact"
-#    teacher_subs_2: "to set up a free monthly subscription."
+#    teacher_subs_1: "Please fill out our"
+#    teacher_subs_2: "Teacher Survey"
+#    teacher_subs_3: "to set up your subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
 #    sub_includes_2: "60+ practice levels"
@@ -640,6 +641,33 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
 #    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
+#  teachers_survey:
+#    title: "Teacher Survey"
+#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+#    retrieving: "Retrieving information..."
+#    being_reviewed_1: "Your application for a free trial subscription is being"
+#    being_reviewed_2: "reviewed"
+#    approved_1: "Your application for a free trial subscription was"
+#    approved_2: "approved."
+#    approved_3: "Further instructions have been sent to"
+#    denied_1: "Your application for a free trial subscription has been"
+#    denied_2: "denied"
+#    contact_1: "Please contact"
+#    contact_2: "if you have further questions."
+#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+#    description_2: "teachers"
+#    description_3: "page."
+#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+#    email: "Email Address"
+#    school_city: "Name of School, City"
+#    age_students: "How old are your students?"
+#    under: "Under"
+#    other: "Other:"
+#    amount_students: "How many students do you teach?"
+#    hear_about: "How did you hear about CodeCombat?"
+#    fill_fields: "Please fill out all fields."
+#    thanks: "Thanks! We'll send you setup instructions shortly."
+
   versions:
     save_version_title: "存新版本"
     new_major_version: "新個重要版本"
diff --git a/app/styles/teachers-free-trial.sass b/app/styles/teachers-free-trial.sass
index 64e50e9e5..feb62ea96 100644
--- a/app/styles/teachers-free-trial.sass
+++ b/app/styles/teachers-free-trial.sass
@@ -3,6 +3,9 @@
   .input-email-address
     width: 40%
 
+  .input-school
+    width: 40%
+
   .input-location
     width: 40%
 
diff --git a/app/templates/admin/trial-requests.jade b/app/templates/admin/trial-requests.jade
index 43a62ae22..eb8ef989e 100644
--- a/app/templates/admin/trial-requests.jade
+++ b/app/templates/admin/trial-requests.jade
@@ -16,6 +16,7 @@ block content
             th Created
             th Reviewed
             th Applicant
+            th School
             th Location
             th Age
             th Students
@@ -36,14 +37,15 @@ block content
                   span= trialRequest.get('reviewDate').substring(0, 10)
               td 
                 a(href="/user/#{trialRequest.get('applicant')}")= trialRequest.get('properties').email
+              td= trialRequest.get('properties').school
               td= trialRequest.get('properties').location
               td= trialRequest.get('properties').age
               td= trialRequest.get('properties').numStudents
               td= trialRequest.get('properties').heardAbout
               td.status-cell
                 if trialRequest.get('status') === 'submitted'
-                  button.btn.btn-xs.btn-success.btn-approve(data-trial-request=trialRequest) Approve
-                  button.btn.btn-xs.btn-danger.btn-deny(data-trial-request=trialRequest) Deny
+                  button.btn.btn-xs.btn-success.btn-approve(data-trial-request-id=trialRequest.id) Approve
+                  button.btn.btn-xs.btn-danger.btn-deny(data-trial-request-id=trialRequest.id) Deny
                 else if trialRequest.get('prepaidCode')
                   span= trialRequest.get('prepaidCode')
                 else
diff --git a/app/templates/teachers-free-trial.jade b/app/templates/teachers-free-trial.jade
index 9a75f8ca6..26960f2cb 100644
--- a/app/templates/teachers-free-trial.jade
+++ b/app/templates/teachers-free-trial.jade
@@ -2,50 +2,54 @@ extends /templates/base
 
 block content
 
-  h2(data-i18n="teachers_survey.title") Teacher Survey
+  h2(data-i18n="teachers_survey.title")
 
   if me.isAnonymous()
-    p(data-i18n="teachers_survey.must_be_logged") You must be logged in first. Please create an account or log in from the menu above.
+    p(data-i18n="teachers_survey.must_be_logged")
   else if fetchingData
-    h4(data-i18n="teachers_survey.retrieving") Retrieving information...
+    h4(data-i18n="teachers_survey.retrieving")
   else if existingRequests.length > 0
     if existingRequests[0].get('status') === 'submitted'
       p
-        span.spr(data-i18n="teachers_survey.being_reviewed_1") Your application for a free trial subscription is being
-        strong(data-i18n="teachers_survey.being_reviewed_2") reviewed
+        span.spr(data-i18n="teachers_survey.being_reviewed_1")
+        strong(data-i18n="teachers_survey.being_reviewed_2")
     else if existingRequests[0].get('status') === 'approved'
       p
-       span.spr(data-i18n="teachers_survey.approved_1") Your application for a free trial subscription was
-       strong.spr(data-i18n="teachers_survey.approved_2") approved.
-       span.spr(data-i18n="teachers_survey.approved_3") Further instructions have been sent to
+       span.spr(data-i18n="teachers_survey.approved_1")
+       strong.spr(data-i18n="teachers_survey.approved_2")
+       span.spr(data-i18n="teachers_survey.approved_3")
        strong= existingRequests[0].get('properties').email
     else
       p
-        span.spr(data-i18n="teachers_survey.denied_1") Your application for a free trial subscription has been
-        strong(data-i18n="teachers_survey.denied_2") denied
+        span.spr(data-i18n="teachers_survey.denied_1")
+        strong(data-i18n="teachers_survey.denied_2")
     p
-      span.spr(data-i18n="teachers_survey.contact_1") Please contact
+      span.spr(data-i18n="teachers_survey.contact_1")
       a(href='mailto:team@codecombat.com') team@codecombat.com
-      span.spl(data-i18n="teachers_survey.contact_2") if you have further questions.
+      span.spl(data-i18n="teachers_survey.contact_2")
   else
     p
-      span.spr(data-i18n="teachers_survey.description_1") We offer free subscriptions to teachers for evaluation purposes. You can find more information on our
-      a(href='/teachers', data-i18n="teachers_survey.description_2") teachers
-      span.spl(data-i18n="teachers_survey.description_3") page.
-    p(data-i18n="teachers_survey.description_4") Please fill out this quick survey and we’ll email you setup instructions.
+      span.spr(data-i18n="teachers_survey.description_1")
+      a(href='/teachers', data-i18n="teachers_survey.description_2")
+      span.spl(data-i18n="teachers_survey.description_3")
+    p(data-i18n="teachers_survey.description_4")
     p.container-email-address
-      label.control-label(data-i18n="teachers_survey.email") Email Address
+      label.control-label(data-i18n="teachers_survey.email")
       br
       input.control-label.input-email-address(type='text', value=email)
+    p.container-school
+      label.control-label(data-i18n="teachers_survey.school")
+      br
+      input.control-label.input-school(type='text')
     p.container-location
-      label.control-label(data-i18n="teachers_survey.school_city") Name of School, City
+      label.control-label(data-i18n="teachers_survey.location")
       br
       input.control-label.input-location(type='text')
     p.container-age
-      label.control-label(data-i18n="teachers_survey.age_students") How old are your students?
+      label.control-label(data-i18n="teachers_survey.age_students")
       div
         input(type="radio", name="age", value="Under 14")
-        span.spl(data-i18n="teachers_survey.under") Under
+        span.spl(data-i18n="teachers_survey.under")
         span.spl 14
       div
         input(type="radio", name="age", value="14-17")
@@ -55,17 +59,17 @@ block content
         span.spl 18+
       div
         input(type="radio", name="age", value='other')
-        span.spl.spr(data-i18n="teachers_survey.other") Other:
+        span.spl.spr(data-i18n="teachers_survey.other")
         input.spr.input-age-other(type='text')
     p.container-num-students
-      label.control-label(data-i18n="teachers_survey.amount_students") How many students do you teach?
+      label.control-label(data-i18n="teachers_survey.amount_students")
       br
       input.control-label.input-num-students(type='text')
     p.container-heard-about
-      label.control-label(data-i18n="teachers_survey.hear_about") How did you hear about CodeCombat?
+      label.control-label(data-i18n="teachers_survey.hear_about")
       br
       textarea.control-label.input-heard-about(rows=4)
-    p.error-message(data-i18n="teachers_survey.fill_fields") Please fill out all fields.
+    p.error-message(data-i18n="teachers_survey.fill_fields")
     p
-      button.btn.btn-default.submit-button(data-i18n="play_level.tome_submit_button") Submit
-    p.thanks-submit(data-i18n="teachers_survey.thanks") Thanks! We'll send you setup instructions shortly.
+      button.btn.btn-default.submit-button(data-i18n="play_level.tome_submit_button")
+    p.thanks-submit(data-i18n="teachers_survey.thanks")
diff --git a/app/views/TeachersFreeTrialView.coffee b/app/views/TeachersFreeTrialView.coffee
index f2df57bc9..2ac210b6a 100644
--- a/app/views/TeachersFreeTrialView.coffee
+++ b/app/views/TeachersFreeTrialView.coffee
@@ -34,6 +34,7 @@ module.exports = class TeachersFreeTrialView extends RootView
 
   onClickSubmit: (e) ->
     email = $('.input-email-address').val()
+    school = $('.input-school').val()
     location = $('.input-location').val()
     age = $('input[name=age]:checked').val()
     age = $('.input-age-other').val() if age is 'other'
@@ -42,6 +43,7 @@ module.exports = class TeachersFreeTrialView extends RootView
 
     # Validate input
     $('.container-email-address').removeClass('has-error')
+    $('.container-school').removeClass('has-error')
     $('.container-location').removeClass('has-error')
     $('.container-age').removeClass('has-error')
     $('.container-num-students').removeClass('has-error')
@@ -51,6 +53,10 @@ module.exports = class TeachersFreeTrialView extends RootView
       $('.container-email-address').addClass('has-error')
       $('.error-message').show()
       return
+    unless school
+      $('.container-school').addClass('has-error')
+      $('.error-message').show()
+      return
     unless location
       $('.container-location').addClass('has-error')
       $('.error-message').show()
@@ -73,6 +79,7 @@ module.exports = class TeachersFreeTrialView extends RootView
       type: 'subscription'
       properties:
         email: email
+        school: school
         location: location
         age: age
         numStudents: numStudents
diff --git a/app/views/admin/TrialRequestsView.coffee b/app/views/admin/TrialRequestsView.coffee
index 7698fda44..5f2f9aec8 100644
--- a/app/views/admin/TrialRequestsView.coffee
+++ b/app/views/admin/TrialRequestsView.coffee
@@ -39,8 +39,8 @@ module.exports = class TrialRequestsView extends RootView
     context
 
   onClickApprove: (e) ->
-    trialRequestData = $(e.target).data('trial-request')
-    trialRequest = _.find @trialRequests.models, (a) -> a.get('_id') is trialRequestData._id
+    trialRequestID = $(e.target).data('trial-request-id')
+    trialRequest = _.find @trialRequests.models, (a) -> a.id is trialRequestID
     unless trialRequest
       console.error 'Could not find trial request model for', trialRequestData
       return
@@ -52,8 +52,8 @@ module.exports = class TrialRequestsView extends RootView
         @render?()
 
   onClickDeny: (e) ->
-    trialRequestData = $(e.target).data('trial-request')
-    trialRequest = _.find @trialRequests.models, (a) -> a.get('_id') is trialRequestData._id
+    trialRequestID = $(e.target).data('trial-request-id')
+    trialRequest = _.find @trialRequests.models, (a) -> a.id is trialRequestID
     unless trialRequest
       console.error 'Could not find trial request model for', trialRequestData
       return