Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

Conflicts:
	app/helpers/attribute_fields_helper.rb
	app/views/admin/infos/_form.html.erb
	config/locales/zh_tw.yml

spec/factories/previews.rb

@@ -0,0 +1,6 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :preview do
+  end
+end

spec/models/preview_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Preview do
+  pending "add some examples to (or delete) #{__FILE__}"
+end