Merge branch 'master' into Translate_View

Views/Chronicle/_ChronicleList.cshtml

@@ -18,7 +18,7 @@
                 <dt>
                     @if (sub.Day != null)
                     {
-                        <span>@string.Format("{0} month{1} day", sub.Month,sub.Day)</span>
+                        <span>@string.Format("{0} - {1}", sub.Month,sub.Day)</span>
                     }
                     else
                     {

Web.config

@@ -11,7 +11,8 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
 		<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
 	</configSections>
 	<connectionStrings>
-		<add name="SigDbContextConnectionString" providerName="MySql.Data.MySqlClient" connectionString="server=localhost;port=3306;UserId=root;Password='';database=xiamendb;CharSet=utf8;Persist Security Info=True;" />
+        <remove name="SigDbContextConnectionString" />
+		<add connectionString="server=localhost;port=3306;UserId=root;Password=root;database=xiamendb_en;CharSet=utf8;Persist Security Info=True" name="SigDbContextConnectionString" providerName="MySql.Data.MySqlClient" />
 	</connectionStrings>
 	<appSettings>
 		<add key="webpages:Version" value="3.0.0.0" />