diff --git a/.gitignore b/.gitignore
index 99331fa..8ee726b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 
 /Gemfile.lock
 app/views/frontend
+/public/uploads/*
diff --git a/Gemfile b/Gemfile
index b300784..5504150 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,6 +25,12 @@ gem 'nokogiri'
 #database
 gem 'mongoid', github: "mongoid/mongoid"
 
+#file uploading and carrierwave
+gem "mini_magick", github: 'minimagick/minimagick'
+gem 'carrierwave'
+gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
+gem 'mongoid-grid_fs', github: 'ahoward/mongoid-grid_fs'
+
 #built in modules
 eval(File.read(File.dirname(__FILE__) + '/built_in_extensions.rb'))
 #modules installed from the store
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
new file mode 100644
index 0000000..1b427d7
--- /dev/null
+++ b/app/uploaders/image_uploader.rb
@@ -0,0 +1,54 @@
+# encoding: utf-8
+require 'carrierwave/processing/mime_types'
+
+class ImageUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or MiniMagick support:
+  # include CarrierWave::RMagick
+  # include CarrierWave::MiniMagick
+  include CarrierWave::MiniMagick
+  include CarrierWave::MimeTypes
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   # For Rails 3.1+ asset pipeline compatibility:
+  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+   version :thumb do
+     process :resize_to_fit => [200, 200]
+   end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_white_list
+     %w(jpg jpeg gif png)
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+
+end
diff --git a/app/views/shared/_authentication_links.html.erb b/app/views/shared/_authentication_links.html.erb
new file mode 100644
index 0000000..e69de29
diff --git a/built_in_extensions.rb b/built_in_extensions.rb
index 0861943..c91f1e7 100644
--- a/built_in_extensions.rb
+++ b/built_in_extensions.rb
@@ -1 +1,2 @@
 gem 'announcement', git: 'git@gitlab.tp.rulingcom.com:saurabh/announcement-test.git'
+gem 'ad_banner', git: 'git@gitlab.tp.rulingcom.com:saurabh/adbanner-test.git' 
\ No newline at end of file
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 47f53a0..72b4d89 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -18,8 +18,10 @@ zh_tw:
   logout: 登出
   dashboard_: 儀表版
   desktop: 桌面
+
   site: 
     system_preference: 系統狀態
+    settings: 基本設定
 
   users:
     admin_change_password: 您不能在此處修改自己的密碼！