Merge branch 'daniel/columns'
diff --git a/app/app.yaml.template b/app/app.yaml.template
index b2816c9..1226b35 100644
--- a/app/app.yaml.template
+++ b/app/app.yaml.template
@@ -15,7 +15,7 @@
 # TODO(proto): uncomment and supply a Google App Engine application instance
 # application: FIXME
 # TODO(release): see the instructions in README about the "version:" field
-version: 2-1-20140317-p1
+version: 2-1-20140319
 runtime: python27
 api_version: 1
 threadsafe: false
diff --git a/app/melange/utils/countries.py b/app/melange/utils/countries.py
index 3e20204..585daa9 100644
--- a/app/melange/utils/countries.py
+++ b/app/melange/utils/countries.py
@@ -23,7 +23,7 @@
 
 
 COUNTRY_INFO = {
-    'Afghanistan, Islamic State of': ('.af', 'Asia'),
+    'Afghanistan': ('.af', 'Asia'),
     'Albania': ('.al', 'Europe'),
     'Algeria': ('.dz', 'Africa'),
     'American Samoa': ('.as', 'Australia'),
diff --git a/app/soc/content/js/templates/modules/gsoc/org_profile/base.js b/app/soc/content/js/templates/modules/gsoc/org_profile/base.js
index 2773c1f..5f6e5e5 100644
--- a/app/soc/content/js/templates/modules/gsoc/org_profile/base.js
+++ b/app/soc/content/js/templates/modules/gsoc/org_profile/base.js
@@ -17,8 +17,8 @@
     jQuery("select, input:radio, input:file, input:checkbox").uniform();
     var fields = ["melange-description-textarea",
                   "melange-contrib_template-textarea",
-                  "melange-accepted_student_msg-textarea",
-                  "melange-rejected_student_msg-textarea",
+                  "melange-accepted_students_message-textarea",
+                  "melange-rejected_students_message-textarea",
                   "melange-role_request_message-textarea"];
     tinyMCE.init(melange.tinyMceConfig(fields, "advanced"));
   }
diff --git a/app/summerofcode/views/proposal_manage.py b/app/summerofcode/views/proposal_manage.py
index 72b58f9..831ef0f 100644
--- a/app/summerofcode/views/proposal_manage.py
+++ b/app/summerofcode/views/proposal_manage.py
@@ -43,7 +43,7 @@
 from summerofcode.views.helper import urls as soc_urls
 
 
-_PROPOSAL_PUBLIC_PAGE_NAME = translation.ugettext('Proposal')
+_PROPOSAL_PUBLIC_PAGE_NAME = translation.ugettext('View Proposal')
 
 _PROPOSAL_REVIEW_PAGE_NAME = translation.ugettext('Review Proposal')
 
@@ -336,7 +336,7 @@
         'abstract': data.url_ndb_proposal.abstract,
         'additional_info': data.url_ndb_proposal.additional_info,
         'content': data.url_ndb_proposal.content,
-        'public_name': _PROPOSAL_PUBLIC_PAGE_NAME,
+        'page_name': _PROPOSAL_PUBLIC_PAGE_NAME,
         'student_name': data.url_ndb_proposal.key.parent().get().public_name,
         'title': data.url_ndb_proposal.title,
     }