intermediate commit

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rails-assets.org'
 source 'https://rubygems.org'
 
-gem 'rails', '4.2.0'
+gem 'rails', '~> 4.2.3'
 gem 'rack-cors', require: 'rack/cors'
 
 # Bundle edge Rails instead:
@@ -18,10 +18,7 @@ gem 'active_model_serializers', '0.9.0' # explicitly outside assets
 group :assets do
   gem 'jquery-rails'
   gem 'jquery-ui-rails'
-  gem 'ember-source', '1.8.1'#, github: 'emberjs/ember.js', require: 'ember/source'
-  gem 'ember-rails'
-  gem 'ember_script-rails', github: 'ghempton/ember-script-rails'
-  gem 'sass-rails', '~> 5.0.0'
+  gem 'sass-rails' #, '~> 5.0.0'
   gem 'coffee-rails' #, '~> 3.2.1'
   #gem 'twitter-bootstrap-rails'
   # Only for mobile assets precompile, not used in this project
@@ -36,13 +33,16 @@ group :assets do
   #gem 'therubyracer', platforms: :ruby
 
   gem 'uglifier', '>= 1.0.3'
-  #gem "emblem-source", github: "machty/emblem.js"
-  gem 'emblem-source', '0.3.18'
+
+  gem 'ember-rails'
+  gem 'ember-source', '~> 1.13.0'
   gem 'emblem-rails'
   gem 'ember-validations-rails'
+  gem 'ember-emblem-template'
 
   gem 'foundation-rails' #, github: 'bterkuile/foundation-rails'
   gem 'ace-rails-ap'
+  gem 'pickadate-rails'
   #gem 'mustache' #, require: 'mustache/railtie'
 end
 
@@ -65,7 +65,7 @@ gem "omniauth-instagram"
 #gem 'simple_form'
 gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails/components/active_decorator'
 #gem 'cmtool', github: 'bterkuile/cmtool'
-gem 'paperclip' #, '3.5.2' # cmtool
+gem 'paperclip', ['>= 4.2.4', '!= 4.3.0'] #, '3.5.2' # cmtool
 #gem 'cmtool', path: './../cmtool'
 gem 'cmtool', github: 'bterkuile/cmtool'
 gem 'kaminari'