Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity

Conflicts:
	app/views/admin/members/edit.html.erb

built_in_extensions.rb

@@ -5,17 +5,6 @@ gem 'gallery', git: 'http://gitlab.tp.rulingcom.com/saurabh/gallery.git'
 gem 'web_resource', git: 'http://gitlab.tp.rulingcom.com/saurabh/links.git'
 gem 'page_content', git: 'http://gitlab.tp.rulingcom.com/saurabh/pagecontent.git'
 gem 'faq', git: 'http://gitlab.tp.rulingcom.com/saurabh/faq.git'
-#Personal Plugins
-gem 'personal_journal', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-journal.git'
-gem 'personal_conference', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-conference.git'
-gem 'personal_book', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-book.git'
-gem 'personal_project', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-project.git'
-gem 'personal_patent', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-patent.git'
-gem 'personal_research', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-research.git'
-gem 'personal_lab', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-lab.git'
-gem 'personal_diploma', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-diploma.git'
-gem 'personal_experience', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-experience.git'
-gem 'personal_honor', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-honor.git'
 
 #widgets
 gem "site_menu_widget", git: 'http://gitlab.tp.rulingcom.com/saurabh/site-menu-widget.git'

config/environment.rb

@@ -15,7 +15,7 @@ if Site.count == 0
   site.title_translations = {:en=>"Orbit",:zh_tw=>"Orbit"}
   site.valid_locales = [:en, :zh_tw]
   site.in_use_locales = site.valid_locales
-  site.site_type = "orbit"
+  site.site_type = "gravity"
   site.template = (Dir.glob("#{Rails.root}/app/templates/*").collect{|temp| temp.split('/').last}-['mobile']).first
   site.save
 end