Merge commit '86597749fd4495062d6da1abc17fcbf6732835b4'

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js.erb
	app/assets/javascripts/crm.js
	app/assets/javascripts/datepicker.js.coffee
	app/assets/javascripts/jquery-noconflict.js
	app/assets/javascripts/search.js.coffee
	app/assets/stylesheets/advanced_search.css.scss
	app/assets/stylesheets/application.css.erb
	app/assets/stylesheets/common.scss
	app/controllers/home_controller.rb
	app/helpers/accounts_helper.rb
	app/helpers/application_helper.rb
	app/mailers/user_mailer.rb
	app/models/entities/contact.rb
	app/models/observers/entity_observer.rb
	app/models/polymorphic/comment.rb
	app/models/polymorphic/task.rb
	app/models/users/ability.rb
	app/models/users/user.rb
	app/views/accounts/_index_brief.html.haml
	app/views/admin/users/_profile.html.haml
	app/views/comments/_comment.html.haml
	app/views/contacts/_index_full.html.haml
	app/views/contacts/_index_long.html.haml
	app/views/contacts/create.js.haml
	app/views/contacts/destroy.js.haml
	app/views/contacts/edit.js.haml
	app/views/contacts/update.js.haml
	app/views/entities/_permissions.html.haml
	app/views/entities/attach.js.haml
	app/views/home/index.html.haml
	app/views/layouts/_tabbed.html.haml
	app/views/layouts/application.html.haml
	app/views/lists/_sidebar.html.haml
	app/views/shared/_paginate_with_per_page.html.haml
	app/views/shared/_select_popup.html.haml
	config/environments/development.rb
	config/initializers/views.rb
	config/locales/en-US_fat_free_crm.yml
	config/routes.rb
	db/schema.rb
	fat_free_crm.gemspec
	lib/fat_free_crm.rb
	lib/fat_free_crm/engine.rb
	public/favicon.ico
	vendor/assets/images/tab_icons/accounts.png
	vendor/assets/images/tab_icons/accounts_active.png

.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 1.9.2
+  - 2.0.0
 
 env:
   - DB=mysql
@@ -10,16 +10,6 @@ env:
 
 gemfile: Gemfile.ci
 
-# Only run a cross-section of 4 builds majoring on r1.9.3
-matrix:
-  exclude:
-    - rvm: 1.9.2
-      env: DB=sqlite
-      gemfile: Gemfile.ci
-    - rvm: 1.9.2
-      env: DB=postgres
-      gemfile: Gemfile.ci
-
 bundler_args: --path=vendor/bundle --without heroku
 
 before_install:

Capfile

@@ -1,5 +1,2 @@
 load 'deploy'
-# Uncomment if you are using Rails' asset pipeline
-    # load 'deploy/assets'
-Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-load 'config/deploy' # remove this line to skip loading any of the default tasks
+load 'config/deploy'

Gemfile

@@ -6,15 +6,6 @@ source 'https://rubygems.org'
 # gem 'sqlite3'
 #gem 'pg', '~> 0.13.2'
 
-# Allows easy switching between locally developed gems, and gems installed from rubygems.org
-# See README for more info at: https://github.com/ndbroadbent/bundler_local_development
-gem 'bundler_local_development', :group => :development, :require => false
-begin
-  require 'bundler_local_development'
-  Bundler.development_gems = [/^ffcrm_/, /ransack/]
-rescue LoadError
-end
-
 # Removes a gem dependency
 def remove(name)
   @dependencies.reject! {|d| d.name == name }
@@ -29,7 +20,7 @@ end
 # Bundler no longer treats runtime dependencies as base dependencies.
 # The following code restores this behaviour.
 # (See https://github.com/carlhuda/bundler/issues/1041)
-spec = Bundler.load_gemspec(Dir["./{,*}.gemspec"].first)
+spec = Bundler.load_gemspec( File.expand_path("../fat_free_crm.gemspec", __FILE__) )
 spec.runtime_dependencies.each do |dep|
   gem dep.name, *(dep.requirement.as_list)
 end
@@ -42,15 +33,12 @@ remove 'fat_free_crm'
 #remove 'ffcrm_merge'
 
 group :development do
-  gem 'thin'
-  gem 'quiet_assets'
-  # Uncomment the following two gems to deploy via Capistrano
-  gem 'rvm-capistrano'
-  gem 'capistrano_colors'
-
-  # Use zeus and guard gems to speed up development
-  # Run 'zeus start' and 'bundle exec guard' to get going
+  # don't load these gems in travis
   unless ENV["CI"]
+    gem 'thin'
+    gem 'quiet_assets'
+    gem 'rvm-capistrano'
+    gem 'capistrano_colors'
     gem 'guard'
     gem 'guard-rspec'
     gem 'guard-rails'
@@ -71,7 +59,7 @@ group :development, :test do
 end
 
 group :test do
-  gem 'capybara', '~> 2.0.3'
+  gem 'capybara'
   gem 'selenium-webdriver'
   gem 'database_cleaner'
   gem "acts_as_fu"
@@ -82,9 +70,9 @@ end
 
 group :heroku do
   gem 'unicorn', :platform => :ruby
+  gem 'rails_12factor'
 end
 
-
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do