Merge branch 'design_team' into ldap

Conflicts:
	Gemfile
	app/models/ad_banner.rb

config/initializers/impression.rb

@@ -0,0 +1,6 @@
+# Use this hook to configure impressionist parameters
+Impressionist.setup do |config|
+  # Define ORM. Could be :active_record (default) and :mongo_mapper
+  # config.orm = :active_record
+  config.orm = :mongoid
+end

config/locales/en.yml

@@ -42,6 +42,7 @@ en:
   sure?: Are you sure?
   update: Update
   view: View
+  view_count: View count
   yes_: "Yes"
 
   all_content: All Content
@@ -67,6 +68,11 @@ en:
   total_visitors: Total Visitors
   traffic: Traffic
 
+  visitors_today: Today's visitors
+  visitors_this_week: This week's visitors
+  visitors_this_month: This month's visitors
+  visitors_this_year: This year's visitors
+
   admin:
     access:
       denied:

config/locales/zh_tw.yml

@@ -39,11 +39,12 @@ zh_tw:
   sure?: 您肯定嗎?
   update: 更新
   view: 檢視
+  view_count: 查看次數
   yes_: "Yes"
 
-  all_content: 全部內容有：
-  all_file: 全部檔案有：
-  all_member: 成員總數：
+  all_content: 全部內容有
+  all_file: 全部檔案有
+  all_member: 成員總數
   content: 內容
   data: 數據
   file: 檔案
@@ -61,9 +62,14 @@ zh_tw:
   site_name: 網站名稱
   statistics: 統計
   title: 標題
-  total_visitors: 造訪次數：
+  total_visitors: 造訪次數
   traffic: 流量
 
+  visitors_today: 今日造訪
+  visitors_this_week: 本星期造訪
+  visitors_this_month: 本月造訪
+  visitors_this_year: 今年造訪
+
   admin:
     access:
       denied: