Merge with sub_roles

Gemfile

@@ -10,13 +10,15 @@ gem 'mini_magick'
 gem 'rubyzip'
 gem 'sinatra'
 gem 'execjs'
-gem 'mongoid'
+gem 'mongoid', :git => 'git://github.com/mongoid/mongoid.git', :ref => '7a915395db50e2bc6071a503a11530e644879e49'
 
 gem 'rake'
 gem 'jquery-rails'
 
 gem 'sprockets'
 
+gem 'radius'
+
 # For linux
 gem 'therubyracer'
 
@@ -33,6 +35,8 @@ end
  gem 'ruby-debug19'
 
 group :test, :development do
+  gem 'spork'
+  gem 'database_cleaner'  #Strategies for cleaning databases. Can be used to ensure a clean state for testing.
   gem "rspec", "~> 2.0"
   gem "rspec-rails", "~> 2.0"
   gem "factory_girl_rails"
@@ -40,6 +44,7 @@ group :test, :development do
   gem "rcov"
   gem "delorean"
   gem "watchr"
+	gem "spork"
   # gem "capybara"
   # gem 'yard'
   # gem "bluecloth"