Merge branch 'master' of https://github.com/Rulingcom/orbit

* 'master' of https://github.com/Rulingcom/orbit: (136 commits)
  member selects
  add paper status textfield
  fix for showing subroles
  member selects
  fix for showing subroles
  add paper status textfield
  delete fixed
  fixed delete function
  delete update
  add co-author json
  user roles starts
  disable data transform when switching attribute field type. new member stable
  correct 'edit' button of journal list
  make fake data
  fix for json and some other bugs
  add delete link
  fixed add journal and co-author curd problem, but have redirect problem...
  hidden file field, and fixed updated function
  Fix album images display
  user roles starts
  ...

Gemfile

@@ -2,6 +2,7 @@ source 'http://rubygems.org'
 gem 'rails', '>=3.1.0', '<3.2.0'
 
 gem "brakeman"
+gem 'mime-types'
 
 gem 'bson_ext'
 gem 'carrierwave'
@@ -24,6 +25,7 @@ gem "mongo_session_store-rails3"
 gem 'mysql2'
 gem 'nokogiri'
 
+
 gem 'radius'
 gem 'rake'
 # gem 'remotipart'
@@ -74,7 +76,8 @@ group :test, :development do
   gem 'pry-remote'
   gem 'pry-stack_explorer'
   gem 'pry-debugger'
-  
+  gem 'faker'
+
   gem "sunspot-rails-tester"
   gem 'spork'
   gem 'database_cleaner'  #Strategies for cleaning databases. Can be used to ensure a clean state for testing.