diff --git a/SQLyog-11.4.0-0.x64Community.exe b/SQLyog-11.4.0-0.x64Community.exe
new file mode 100644
index 000000000..3260386be
Binary files /dev/null and b/SQLyog-11.4.0-0.x64Community.exe differ
diff --git a/app/views/account/password_recovery.html.erb b/app/views/account/password_recovery.html.erb
index ff455f325..568d4d4bb 100644
--- a/app/views/account/password_recovery.html.erb
+++ b/app/views/account/password_recovery.html.erb
@@ -12,9 +12,9 @@
     </p>
 
     <p>
-      <label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
-      <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %>
-    </p>
+		<label for="new_password_confirmation"><%= l(:field_password_confirmation)%> <span class="required">*</span></label>
+		<%= password_field_tag 'new_password_confirmation', nil, :size => 25 %>
+	</p>
   </div>
   <p><%= submit_tag l(:button_save) %></p>
 <% end %>
diff --git a/config/database.yml.example b/config/database.yml.example
deleted file mode 100644
index f4c2470bb..000000000
--- a/config/database.yml.example
+++ /dev/null
@@ -1,52 +0,0 @@
-# Default setup is given for MySQL with ruby1.9. If you're running Redmine
-# with MySQL and ruby1.8, replace the adapter name with `mysql`.
-# Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end.
-# Line indentation must be 2 spaces (no tabs).
-
-production:
-  adapter: mysql2
-  database: redmine
-  host: localhost
-  username: root
-  password: ""
-  encoding: utf8
-
-development:
-  adapter: mysql2
-  database: redmine_development
-  host: 10.107.17.20
-  username: root
-  password: "1234"
-  encoding: utf8
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql2
-  database: redmine_test
-  host: 10.107.17.20
-  username: root
-  password: "1234"
-  encoding: utf8
-
-# PostgreSQL configuration example
-#production:
-#  adapter: postgresql
-#  database: redmine
-#  host: localhost
-#  username: postgres
-#  password: "postgres"
-
-# SQLite3 configuration example
-#production:
-#  adapter: sqlite3
-#  database: db/redmine.sqlite3
-
-# SQL Server configuration example
-#production:
-#  adapter: sqlserver
-#  database: redmine
-#  host: localhost
-#  username: jenkins
-#  password: jenkins
diff --git a/db/schema.rb b/db/schema.rb
index 1307dd913..db51ddd37 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -437,14 +437,14 @@ ActiveRecord::Schema.define(:version => 20140826072838) do
     t.string   "web_title"
     t.string   "title"
     t.text     "description"
+    t.string   "page_type"
     t.datetime "created_at",                    :null => false
     t.datetime "updated_at",                    :null => false
-    t.string   "page_type"
     t.integer  "sort_type"
-    t.integer  "show_course",  :default => 1
-    t.integer  "show_contest", :default => 1
     t.integer  "image_width",  :default => 107
     t.integer  "image_height", :default => 63
+    t.integer  "show_course",  :default => 1
+    t.integer  "show_contest", :default => 1
   end
 
   create_table "forums", :force => true do |t|
@@ -458,26 +458,6 @@ ActiveRecord::Schema.define(:version => 20140826072838) do
     t.datetime "updated_at",                  :null => false
   end
 
-  create_table "gitlab_projects", :force => true do |t|
-    t.integer  "gitlab_project_id"
-    t.integer  "project_id"
-    t.string   "repository_url"
-    t.string   "web_url"
-    t.string   "localfile_url"
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
-  end
-
-  create_table "gitlab_users", :force => true do |t|
-    t.integer  "gitlab_user_id"
-    t.integer  "user_id"
-    t.string   "email"
-    t.string   "password"
-    t.string   "login",          :null => false
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
   create_table "groups_users", :id => false, :force => true do |t|
     t.integer "group_id", :null => false
     t.integer "user_id",  :null => false