diff --git a/.gitignore b/.gitignore
index 8406dc260..056a8b833 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,11 @@ spec/fixtures/*.fixture.*
 coverage/
 xml_locales/
 
+# Sprites
+app/assets/images/branding-*.png
+app/assets/images/icons-*.png
+app/assets/images/social_media_logos-*.png
+
 #Documentation
 .yardoc/
 doc/
diff --git a/Gemfile b/Gemfile
index 79abde1c7..3df2e8f31 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ gem 'actionpack-action_caching'
 gem 'actionpack-page_caching'
 
 # responders (class level)
-gem 'responders', '2.0.2'
+gem 'responders', '2.1.0'
 
 # Appserver
 
@@ -19,7 +19,7 @@ gem 'unicorn', '4.8.3', :require => false
 # API and JSON
 
 gem 'acts_as_api', '0.4.2'
-gem 'json',        '1.8.1'
+gem 'json',        '1.8.2'
 
 # Authentication
 
@@ -29,11 +29,11 @@ gem 'devise-token_authenticatable', '~> 0.3.0'
 
 # Captcha
 
-gem 'simple_captcha2', '0.3.2', :require => 'simple_captcha'
+gem 'simple_captcha2', '0.3.4', :require => 'simple_captcha'
 
 # Background processing
 
-gem 'sidekiq', '3.3.0'
+gem 'sidekiq', '3.3.2'
 gem 'sinatra', '1.4.5'
 
 # Scheduled processing
@@ -42,7 +42,7 @@ gem 'sidetiq', '0.6.3'
 
 # Compression
 
-gem 'uglifier', '2.5.3'
+gem 'uglifier', '2.7.1'
 
 # Configuration
 
@@ -50,20 +50,20 @@ gem 'configurate', '0.2.0'
 
 # Cross-origin resource sharing
 
-gem 'rack-cors', '0.2.9', :require => 'rack/cors'
+gem 'rack-cors', '0.3.1', :require => 'rack/cors'
 
 # CSS
 
 gem 'bootstrap-sass', '2.3.2.2'
-gem 'compass-rails',  '2.0.0'
-gem 'sass-rails',     '4.0.4'
-gem 'autoprefixer-rails', '4.0.2.1'
+gem 'compass-rails',  '2.0.4'
+gem 'sass-rails',     '5.0.1'
+gem 'autoprefixer-rails', '5.1.7'
 
 # Database
 
 ENV['DB'] ||= 'mysql'
 
-gem 'mysql2', '0.3.17' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
+gem 'mysql2', '0.3.18' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
 gem 'pg',     '0.18.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
 
 gem 'activerecord-import', '0.7.0'
@@ -71,8 +71,8 @@ gem 'activerecord-import', '0.7.0'
 # File uploading
 
 gem 'carrierwave', '0.10.0'
-gem 'fog',         '1.25.0'
-gem 'mini_magick', '4.0.1'
+gem 'fog',         '1.28.0'
+gem 'mini_magick', '4.1.0'
 gem 'remotipart',  '1.2.1'
 
 # GUID generation
@@ -85,11 +85,11 @@ gem 'entypo-rails', '2.2.2'
 # JavaScript
 
 gem 'backbone-on-rails',                                '1.1.2'
-gem 'handlebars_assets',                                '0.18.0'
+gem 'handlebars_assets',                                '0.20.1'
 gem 'jquery-rails',                                     '3.1.2'
 gem 'rails-assets-jquery',                              '1.11.1' # Should be kept in sync with jquery-rails
-gem 'js_image_paths',                                   '0.0.1'
-gem 'js-routes',                                        '0.9.9'
+gem 'js_image_paths',                                   '0.0.2'
+gem 'js-routes',                                        '1.0.0'
 gem 'rails-assets-punycode',                            '1.3.2'
 gem 'rails-assets-markdown-it',                         '3.0.6'
 gem 'rails-assets-markdown-it-hashtag',                 '0.2.3'
@@ -103,15 +103,15 @@ gem 'rails-assets-markdown-it-sup',                     '0.1.0'
 
 gem 'rails-assets-jeresig--jquery.hotkeys', '0.2.0'
 gem 'rails-assets-jquery-idletimer',        '1.0.1'
-gem 'rails-assets-jquery-placeholder',      '2.0.8'
+gem 'rails-assets-jquery-placeholder',      '2.1.1'
 gem 'rails-assets-jquery-textchange',       '0.2.3'
-gem 'rails-assets-perfect-scrollbar',       '0.5.7'
+gem 'rails-assets-perfect-scrollbar',       '0.5.9'
 
 # Localization
 
-gem 'http_accept_language', '2.0.2'
+gem 'http_accept_language', '2.0.5'
 gem 'i18n-inflector-rails', '1.0.7'
-gem 'rails-i18n',           '4.0.3'
+gem 'rails-i18n',           '4.0.4'
 
 # Mail
 
@@ -120,11 +120,11 @@ gem 'messagebus_ruby_api', '1.0.3'
 
 # Parsing
 
-gem 'nokogiri',          '1.6.4.1'
-gem 'redcarpet',         '3.2.0'
-gem 'twitter-text',      '1.10.0'
+gem 'nokogiri',          '1.6.6.2'
+gem 'redcarpet',         '3.2.2'
+gem 'twitter-text',      '1.11.0'
 gem 'roxml',             '3.1.6'
-gem 'ruby-oembed',       '0.8.11'
+gem 'ruby-oembed',       '0.8.12'
 gem 'open_graph_reader', '0.4.0'
 
 
@@ -137,26 +137,30 @@ gem 'omniauth-twitter',  '1.0.1'
 gem 'twitter',           '4.8.1'
 gem 'omniauth-wordpress','0.2.1'
 
+# Serializers
+
+gem 'active_model_serializers', '0.9.3'
+
 # XMPP chat dependencies
 gem 'diaspora-vines',             '~> 0.1.27'
 gem 'rails-assets-diaspora_jsxc', '~> 0.0.12'
 
 # Tags
 
-gem 'acts-as-taggable-on', '3.4.2'
+gem 'acts-as-taggable-on', '3.4.4'
 
 # URIs and HTTP
 
-gem 'addressable',        '2.3.6', :require => 'addressable/uri'
-gem 'faraday',            '0.9.0'
+gem 'addressable',        '2.3.7', :require => 'addressable/uri'
+gem 'faraday',            '0.9.1'
 gem 'faraday_middleware', '0.9.1'
 gem 'faraday-cookie_jar', '0.0.6'
-gem 'typhoeus',           '0.6.9'
+gem 'typhoeus',           '0.7.1'
 
 # Views
 
 gem 'gon',                     '5.2.3'
-gem 'haml',                    '4.0.5'
+gem 'haml',                    '4.0.6'
 gem 'mobile-fu',               '1.3.1'
 gem 'will_paginate',           '3.0.7'
 gem 'rails-timeago',           '2.11.0'
@@ -172,9 +176,6 @@ gem 'zip-zip'
 # https://github.com/discourse/discourse/pull/238
 gem 'minitest'
 
-# Serializers
-gem 'active_model_serializers'
-
 # Windows and OSX have an execjs compatible runtime built-in, Linux users should
 # install Node.js or use 'therubyracer'.
 #
@@ -186,7 +187,7 @@ group :production do # we don't install these on travis to speed up test runs
 
   # Administration
 
-  gem 'rails_admin', '0.6.5'
+  gem 'rails_admin', '0.6.6'
 
   # Analytics
 
@@ -195,7 +196,7 @@ group :production do # we don't install these on travis to speed up test runs
 
   # Click-jacking protection
 
-  gem 'rack-protection', '1.5.2'
+  gem 'rack-protection', '1.5.3'
 
   # Process management
 
@@ -203,7 +204,7 @@ group :production do # we don't install these on travis to speed up test runs
 
   # Redirects
 
-  gem 'rack-rewrite', '1.5.0', :require => false
+  gem 'rack-rewrite', '1.5.1', :require => false
   gem 'rack-ssl',     '1.4.1', :require => 'rack/ssl'
 
   # Third party asset hosting
@@ -213,9 +214,9 @@ end
 
 group :development do
   # Automatic test runs
-  gem 'guard-cucumber', '1.5.1'
-  gem 'guard-rspec',    '4.3.1'
-  gem 'guard',          '2.10.0', :require => false
+  gem 'guard-cucumber', '1.5.3'
+  gem 'guard-rspec',    '4.5.0'
+  gem 'guard',          '2.12.4', :require => false
   gem 'rb-fsevent',     '0.9.4', :require => false
   gem 'rb-inotify',     '0.9.5', :require => false
 
@@ -224,8 +225,8 @@ group :development do
 
   # Preloading environment
 
-  gem 'spring', '1.3.1'
-  gem 'spring-commands-rspec', '1.0.2'
+  gem 'spring', '1.3.3'
+  gem 'spring-commands-rspec', '1.0.4'
   gem 'spring-commands-cucumber', '1.0.1'
 
   # Debugging
@@ -239,19 +240,19 @@ group :test do
 
   gem 'fixture_builder',   '0.3.6'
   gem 'fuubar',            '2.0.0'
-  gem 'rspec-instafail',   '0.2.5', :require => false
+  gem 'rspec-instafail',   '0.2.6', :require => false
   gem 'test_after_commit', '0.4.0'
 
   # Cucumber (integration tests)
 
   gem 'capybara',           '2.4.4'
-  gem 'database_cleaner',   '1.3.0'
-  gem 'selenium-webdriver', '2.44.0'
+  gem 'database_cleaner',   '1.4.0'
+  gem 'selenium-webdriver', '2.45.0'
 
   # General helpers
 
   gem 'factory_girl_rails', '4.5.0'
-  gem 'timecop',            '0.7.1'
+  gem 'timecop',            '0.7.3'
   gem 'webmock',            '1.20.4', :require => false
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 9e27def2d..a3c0b83f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
   specs:
-    CFPropertyList (2.2.8)
+    CFPropertyList (2.3.0)
     actionmailer (4.2.0)
       actionpack (= 4.2.0)
       actionview (= 4.2.0)
@@ -26,9 +26,8 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    active_model_serializers (0.9.0)
+    active_model_serializers (0.9.3)
       activemodel (>= 3.2)
-      builder (~> 3.1)
     activejob (4.2.0)
       activesupport (= 4.2.0)
       globalid (>= 0.3.0)
@@ -51,20 +50,21 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    acts-as-taggable-on (3.4.2)
+    acts-as-taggable-on (3.4.4)
       activerecord (>= 3.2, < 5)
     acts_as_api (0.4.2)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       rack (>= 1.1.0)
-    addressable (2.3.6)
+    addressable (2.3.7)
     arel (6.0.0)
     asset_sync (1.1.0)
       activemodel
       fog (>= 1.8.0)
       unf
-    autoprefixer-rails (4.0.2.1)
+    autoprefixer-rails (5.1.7)
       execjs
+      json
     backbone-on-rails (1.1.2.0)
       actionmailer
       actionpack
@@ -74,7 +74,7 @@ GEM
       ejs
       jquery-rails
       railties
-    bcrypt (3.1.9)
+    bcrypt (3.1.10)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
     builder (3.2.2)
@@ -97,7 +97,7 @@ GEM
       timers (~> 4.0.0)
     childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
-    chunky_png (1.3.3)
+    chunky_png (1.3.4)
     coderay (1.1.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
@@ -105,31 +105,41 @@ GEM
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
-    columnize (0.8.9)
-    compass (0.12.7)
+    coffee-script-source (1.9.1)
+    columnize (0.9.0)
+    compass (1.0.3)
       chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.2.19)
-    compass-rails (2.0.0)
-      compass (>= 0.12.2)
+      compass-core (~> 1.0.2)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.3)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
+    compass-rails (2.0.4)
+      compass (~> 1.0.0)
+      sass-rails (<= 5.0.1)
+      sprockets (< 2.13)
     configurate (0.2.0)
-    connection_pool (2.1.0)
+    connection_pool (2.1.1)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    cucumber (1.3.17)
+    cucumber (1.3.19)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
+      multi_test (>= 0.1.2)
     cucumber-rails (1.4.2)
       capybara (>= 1.1.2, < 3)
       cucumber (>= 1.3.8, < 2)
       mime-types (>= 1.16, < 3)
       nokogiri (~> 1.5)
       rails (>= 3, < 5)
-    database_cleaner (1.3.0)
+    database_cleaner (1.4.0)
     debugger-linecache (1.2.0)
     devise (3.4.1)
       bcrypt (~> 3.0)
@@ -155,7 +165,7 @@ GEM
       http_parser.rb (~> 0.6)
       nokogiri (~> 1.6)
     diff-lcs (1.2.5)
-    domain_name (0.5.22)
+    domain_name (0.5.23)
       unf (>= 0.0.5, < 1.0.0)
     eco (1.0.0)
       coffee-script
@@ -169,17 +179,17 @@ GEM
     entypo-rails (2.2.2)
       railties (>= 3.1, <= 5)
     erubis (2.7.0)
-    ethon (0.7.1)
+    ethon (0.7.3)
       ffi (>= 1.3.0)
     eventmachine (1.0.7)
-    excon (0.41.0)
-    execjs (2.2.2)
+    excon (0.44.3)
+    execjs (2.3.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    faraday (0.9.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
@@ -192,32 +202,48 @@ GEM
     fixture_builder (0.3.6)
       activerecord (>= 2)
       activesupport (>= 2)
-    fog (1.25.0)
+    fog (1.28.0)
+      fog-atmos
+      fog-aws (~> 0.0)
       fog-brightbox (~> 0.4)
-      fog-core (~> 1.25)
+      fog-core (~> 1.27, >= 1.27.3)
+      fog-ecloud
       fog-json
       fog-profitbricks
       fog-radosgw (>= 0.0.2)
+      fog-riakcs
       fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
       fog-softlayer
+      fog-storm_on_demand
       fog-terremark
       fog-vmfusion
       fog-voxel
       fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
-      opennebula
-    fog-brightbox (0.6.1)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (0.1.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.7.1)
       fog-core (~> 1.22)
       fog-json
-      inflecto
-    fog-core (1.25.0)
+      inflecto (~> 0.0.2)
+    fog-core (1.29.0)
       builder
       excon (~> 0.38)
       formatador (~> 0.2)
       mime-types
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
+    fog-ecloud (0.0.2)
+      fog-core
+      fog-xml
     fog-json (1.0.0)
       multi_json (~> 1.0)
     fog-profitbricks (0.0.1)
@@ -228,68 +254,84 @@ GEM
       fog-core (>= 1.21.0)
       fog-json
       fog-xml (>= 0.0.1)
-    fog-sakuracloud (0.1.1)
+    fog-riakcs (0.1.0)
       fog-core
       fog-json
-    fog-softlayer (0.3.24)
+      fog-xml
+    fog-sakuracloud (1.0.0)
       fog-core
       fog-json
-    fog-terremark (0.0.3)
+    fog-serverlove (0.1.1)
+      fog-core
+      fog-json
+    fog-softlayer (0.4.1)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.0)
+      fog-core
+      fog-json
+    fog-terremark (0.0.4)
       fog-core
       fog-xml
     fog-vmfusion (0.0.1)
       fission
       fog-core
-    fog-voxel (0.0.1)
+    fog-voxel (0.0.2)
       fog-core
       fog-xml
     fog-xml (0.1.1)
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
-    font-awesome-rails (4.2.0.0)
+    font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
     foreman (0.62.0)
       thor (>= 0.13.6)
     formatador (0.2.5)
-    fssm (0.2.10)
     fuubar (2.0.0)
       rspec (~> 3.0)
       ruby-progressbar (~> 1.4)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    globalid (0.3.0)
+    globalid (0.3.3)
       activesupport (>= 4.1.0)
     gon (5.2.3)
       actionpack (>= 2.3.0)
       json
       multi_json
       request_store (>= 1.0.5)
-    guard (2.10.0)
+    guard (2.12.4)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-cucumber (1.5.1)
+    guard-compat (1.2.1)
+    guard-cucumber (1.5.3)
       cucumber (>= 1.3.0)
       guard (>= 2.0.0)
-    guard-rspec (4.3.1)
+      guard-compat (~> 1.0)
+      nenv (~> 0.1)
+    guard-rspec (4.5.0)
       guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
-    haml (4.0.5)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    haml (4.0.6)
       tilt
-    handlebars_assets (0.18)
-      execjs (>= 1.2.9)
-      multi_json
-      sprockets (>= 2.0.3)
-      tilt
-    hashie (3.3.1)
+    handlebars_assets (0.20.1)
+      execjs (~> 2.0)
+      multi_json (~> 1.0)
+      sprockets (~> 2.0)
+      tilt (~> 1.2)
+    hashie (3.4.0)
     hike (1.2.3)
     hiredis (0.5.2)
     hitimes (1.2.2)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    http_accept_language (2.0.2)
+    http_accept_language (2.0.5)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
     i18n-inflector (2.6.7)
@@ -311,25 +353,25 @@ GEM
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.2)
+    jquery-ui-rails (5.0.3)
       railties (>= 3.2.16)
-    js-routes (0.9.9)
+    js-routes (1.0.0)
       railties (>= 3.2)
       sprockets-rails
-    js_image_paths (0.0.1)
+    js_image_paths (0.0.2)
       rails (~> 4.0)
     jshint (1.3.1)
       execjs (>= 1.4.0)
       multi_json (~> 1.0)
       therubyracer (~> 0.12.1)
-    json (1.8.1)
-    jwt (1.0.0)
-    kaminari (0.16.1)
+    json (1.8.2)
+    jwt (1.3.0)
+    kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.9.2)
+    kgio (2.9.3)
     libv8 (3.16.14.7)
-    listen (2.8.3)
+    listen (2.8.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -345,23 +387,27 @@ GEM
     messagebus_ruby_api (1.0.3)
     method_source (0.8.2)
     mime-types (2.4.3)
-    mini_magick (4.0.1)
-    mini_portile (0.6.1)
-    minitest (5.5.0)
+    mini_magick (4.1.0)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
     mobile-fu (1.3.1)
       rack-mobile-detect
       rails
     multi_json (1.10.1)
-    multi_test (0.1.1)
+    multi_test (0.1.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql2 (0.3.17)
+    mysql2 (0.3.18)
+    nenv (0.2.0)
     nested_form (0.3.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
-    nokogiri (1.6.4.1)
+    net-ssh (2.9.2)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    notiffany (0.0.6)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     oauth (0.4.7)
     oauth2 (0.9.4)
       faraday (>= 0.8, < 0.10)
@@ -392,23 +438,19 @@ GEM
     open_graph_reader (0.4.0)
       faraday (~> 0.9.0)
       nokogiri (~> 1.6)
-    opennebula (4.10.1)
-      json
-      nokogiri
-      rbvmomi
     orm_adapter (0.5.0)
     phantomjs (1.9.8.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (2.0.0)
+    pry-byebug (3.0.1)
       byebug (~> 3.4)
       pry (~> 0.10)
     pry-debundle (0.8)
       pry
     rack (1.6.0)
-    rack-cors (0.2.9)
+    rack-cors (0.3.1)
     rack-google-analytics (1.2.0)
       actionpack
       activesupport
@@ -418,12 +460,12 @@ GEM
     rack-pjax (0.8.0)
       nokogiri (~> 1.5)
       rack (~> 1.1)
-    rack-protection (1.5.2)
+    rack-protection (1.5.3)
       rack
-    rack-rewrite (1.5.0)
+    rack-rewrite (1.5.1)
     rack-ssl (1.4.1)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.0)
       actionmailer (= 4.2.0)
@@ -448,11 +490,12 @@ GEM
     rails-assets-jeresig--jquery.hotkeys (0.2.0)
       rails-assets-jquery (>= 1.4.2)
     rails-assets-jquery (1.11.1)
-    rails-assets-jquery-colorbox (1.5.14)
+    rails-assets-jquery-colorbox (1.5.15)
       rails-assets-jquery (>= 1.3.2)
     rails-assets-jquery-fullscreen (1.1.4)
     rails-assets-jquery-idletimer (1.0.1)
-    rails-assets-jquery-placeholder (2.0.8)
+    rails-assets-jquery-placeholder (2.1.1)
+      rails-assets-jquery (>= 1.6)
     rails-assets-jquery-textchange (0.2.3)
       rails-assets-jquery
     rails-assets-jquery-ui (1.10.4)
@@ -466,7 +509,7 @@ GEM
     rails-assets-markdown-it-sanitizer (0.2.1)
     rails-assets-markdown-it-sub (0.1.0)
     rails-assets-markdown-it-sup (0.1.0)
-    rails-assets-perfect-scrollbar (0.5.7)
+    rails-assets-perfect-scrollbar (0.5.9)
       rails-assets-jquery (>= 1.10)
     rails-assets-punycode (1.3.2)
     rails-deprecated_sanitizer (1.0.3)
@@ -477,7 +520,7 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.1)
       loofah (~> 2.0)
-    rails-i18n (4.0.3)
+    rails-i18n (4.0.4)
       i18n (~> 0.6)
       railties (~> 4.0)
     rails-observers (0.1.2)
@@ -485,12 +528,12 @@ GEM
     rails-timeago (2.11.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
-    rails_admin (0.6.5)
+    rails_admin (0.6.6)
       builder (~> 3.1)
       coffee-rails (~> 4.0)
       font-awesome-rails (>= 3.0, < 5)
       haml (~> 4.0)
-      jquery-rails (~> 3.0)
+      jquery-rails (>= 3.0, < 5)
       jquery-ui-rails (~> 5.0)
       kaminari (~> 0.14)
       nested_form (~> 0.3)
@@ -498,7 +541,7 @@ GEM
       rails (~> 4.0)
       remotipart (~> 1.0)
       safe_yaml (~> 1.0)
-      sass-rails (~> 4.0)
+      sass-rails (>= 4.0, < 6)
     railties (4.2.0)
       actionpack (= 4.2.0)
       activesupport (= 4.2.0)
@@ -509,19 +552,15 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rbvmomi (1.8.2)
-      builder
-      nokogiri (>= 1.4.1)
-      trollop
-    redcarpet (3.2.0)
-    redis (3.1.0)
+    redcarpet (3.2.2)
+    redis (3.2.1)
     redis-namespace (1.5.1)
       redis (~> 3.0, >= 3.0.4)
     ref (1.0.5)
     remotipart (1.2.1)
     request_store (1.1.0)
-    responders (2.0.2)
-      railties (>= 4.2.0.alpha, < 5)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
     roxml (3.1.6)
       activesupport (>= 2.3.0)
       nokogiri (>= 1.3.3)
@@ -534,7 +573,7 @@ GEM
     rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.1.0)
-    rspec-instafail (0.2.5)
+    rspec-instafail (0.2.6)
       rspec
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
@@ -547,24 +586,26 @@ GEM
       rspec-mocks (~> 3.1.0)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    ruby-oembed (0.8.11)
-    ruby-progressbar (1.7.0)
-    rubyzip (1.1.6)
+    ruby-oembed (0.8.12)
+    ruby-progressbar (1.7.1)
+    rubyzip (1.1.7)
     safe_yaml (1.0.4)
-    sass (3.2.19)
-    sass-rails (4.0.4)
+    sass (3.4.13)
+    sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 2.12)
-      sprockets-rails (~> 2.0)
-    selenium-webdriver (2.44.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
+    selenium-webdriver (2.45.0)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sidekiq (3.3.0)
+    shellany (0.0.1)
+    sidekiq (3.3.2)
       celluloid (>= 0.16.0)
-      connection_pool (>= 2.0.0)
+      connection_pool (>= 2.1.1)
       json
       redis (>= 3.0.6)
       redis-namespace (>= 1.3.1)
@@ -572,7 +613,7 @@ GEM
       celluloid (>= 0.14.1)
       ice_cube (= 0.11.1)
       sidekiq (>= 3.0.0)
-    simple_captcha2 (0.3.2)
+    simple_captcha2 (0.3.4)
       rails (>= 4.1)
     simple_oauth (0.2.0)
     sinatra (1.4.5)
@@ -582,17 +623,17 @@ GEM
     sinon-rails (1.10.3)
       railties (>= 3.1)
     slop (3.6.0)
-    spring (1.3.1)
+    spring (1.3.3)
     spring-commands-cucumber (1.0.1)
       spring (>= 0.9.1)
-    spring-commands-rspec (1.0.2)
+    spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (2.11.3)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -605,21 +646,20 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    timecop (0.7.1)
+    timecop (0.7.3)
     timers (4.0.1)
       hitimes
-    trollop (2.0)
     twitter (4.8.1)
       faraday (~> 0.8, < 0.10)
       multi_json (~> 1.0)
       simple_oauth (~> 0.2)
-    twitter-text (1.10.0)
+    twitter-text (1.11.0)
       unf (~> 0.1.0)
-    typhoeus (0.6.9)
+    typhoeus (0.7.1)
       ethon (>= 0.7.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.5.3)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unf (0.1.4)
@@ -649,56 +689,56 @@ PLATFORMS
 DEPENDENCIES
   actionpack-action_caching
   actionpack-page_caching
-  active_model_serializers
+  active_model_serializers (= 0.9.3)
   activerecord-import (= 0.7.0)
-  acts-as-taggable-on (= 3.4.2)
+  acts-as-taggable-on (= 3.4.4)
   acts_as_api (= 0.4.2)
-  addressable (= 2.3.6)
+  addressable (= 2.3.7)
   asset_sync (= 1.1.0)
-  autoprefixer-rails (= 4.0.2.1)
+  autoprefixer-rails (= 5.1.7)
   backbone-on-rails (= 1.1.2)
   bootstrap-sass (= 2.3.2.2)
   capybara (= 2.4.4)
   carrierwave (= 0.10.0)
-  compass-rails (= 2.0.0)
+  compass-rails (= 2.0.4)
   configurate (= 0.2.0)
   cucumber-rails (= 1.4.2)
-  database_cleaner (= 1.3.0)
+  database_cleaner (= 1.4.0)
   devise (= 3.4.1)
   devise-token_authenticatable (~> 0.3.0)
   devise_lastseenable (= 0.0.4)
   diaspora-vines (~> 0.1.27)
   entypo-rails (= 2.2.2)
   factory_girl_rails (= 4.5.0)
-  faraday (= 0.9.0)
+  faraday (= 0.9.1)
   faraday-cookie_jar (= 0.0.6)
   faraday_middleware (= 0.9.1)
   fixture_builder (= 0.3.6)
-  fog (= 1.25.0)
+  fog (= 1.28.0)
   foreman (= 0.62)
   fuubar (= 2.0.0)
   gon (= 5.2.3)
-  guard (= 2.10.0)
-  guard-cucumber (= 1.5.1)
-  guard-rspec (= 4.3.1)
-  haml (= 4.0.5)
-  handlebars_assets (= 0.18.0)
-  http_accept_language (= 2.0.2)
+  guard (= 2.12.4)
+  guard-cucumber (= 1.5.3)
+  guard-rspec (= 4.5.0)
+  haml (= 4.0.6)
+  handlebars_assets (= 0.20.1)
+  http_accept_language (= 2.0.5)
   i18n-inflector-rails (= 1.0.7)
   jasmine (= 2.2.0)
   jasmine-jquery-rails (= 2.0.3)
   jquery-rails (= 3.1.2)
-  js-routes (= 0.9.9)
-  js_image_paths (= 0.0.1)
+  js-routes (= 1.0.0)
+  js_image_paths (= 0.0.2)
   jshint (= 1.3.1)
-  json (= 1.8.1)
+  json (= 1.8.2)
   markerb (= 1.0.2)
   messagebus_ruby_api (= 1.0.3)
-  mini_magick (= 4.0.1)
+  mini_magick (= 4.1.0)
   minitest
   mobile-fu (= 1.3.1)
-  mysql2 (= 0.3.17)
-  nokogiri (= 1.6.4.1)
+  mysql2 (= 0.3.18)
+  nokogiri (= 1.6.6.2)
   omniauth (= 1.2.2)
   omniauth-facebook (= 1.6.0)
   omniauth-tumblr (= 1.1)
@@ -708,11 +748,11 @@ DEPENDENCIES
   pry
   pry-byebug
   pry-debundle
-  rack-cors (= 0.2.9)
+  rack-cors (= 0.3.1)
   rack-google-analytics (= 1.2.0)
   rack-piwik (= 0.3.0)
-  rack-protection (= 1.5.2)
-  rack-rewrite (= 1.5.0)
+  rack-protection (= 1.5.3)
+  rack-rewrite (= 1.5.1)
   rack-ssl (= 1.4.1)
   rails (= 4.2.0)
   rails-assets-diaspora_jsxc (~> 0.0.12)
@@ -720,7 +760,7 @@ DEPENDENCIES
   rails-assets-jeresig--jquery.hotkeys (= 0.2.0)
   rails-assets-jquery (= 1.11.1)
   rails-assets-jquery-idletimer (= 1.0.1)
-  rails-assets-jquery-placeholder (= 2.0.8)
+  rails-assets-jquery-placeholder (= 2.1.1)
   rails-assets-jquery-textchange (= 0.2.3)
   rails-assets-markdown-it (= 3.0.6)
   rails-assets-markdown-it--markdown-it-for-inline (= 0.1.0)
@@ -729,36 +769,36 @@ DEPENDENCIES
   rails-assets-markdown-it-sanitizer (= 0.2.1)
   rails-assets-markdown-it-sub (= 0.1.0)
   rails-assets-markdown-it-sup (= 0.1.0)
-  rails-assets-perfect-scrollbar (= 0.5.7)
+  rails-assets-perfect-scrollbar (= 0.5.9)
   rails-assets-punycode (= 1.3.2)
-  rails-i18n (= 4.0.3)
+  rails-i18n (= 4.0.4)
   rails-timeago (= 2.11.0)
-  rails_admin (= 0.6.5)
+  rails_admin (= 0.6.6)
   rb-fsevent (= 0.9.4)
   rb-inotify (= 0.9.5)
-  redcarpet (= 3.2.0)
+  redcarpet (= 3.2.2)
   remotipart (= 1.2.1)
-  responders (= 2.0.2)
+  responders (= 2.1.0)
   roxml (= 3.1.6)
-  rspec-instafail (= 0.2.5)
+  rspec-instafail (= 0.2.6)
   rspec-rails (= 3.1.0)
-  ruby-oembed (= 0.8.11)
-  sass-rails (= 4.0.4)
-  selenium-webdriver (= 2.44.0)
-  sidekiq (= 3.3.0)
+  ruby-oembed (= 0.8.12)
+  sass-rails (= 5.0.1)
+  selenium-webdriver (= 2.45.0)
+  sidekiq (= 3.3.2)
   sidetiq (= 0.6.3)
-  simple_captcha2 (= 0.3.2)
+  simple_captcha2 (= 0.3.4)
   sinatra (= 1.4.5)
   sinon-rails (= 1.10.3)
-  spring (= 1.3.1)
+  spring (= 1.3.3)
   spring-commands-cucumber (= 1.0.1)
-  spring-commands-rspec (= 1.0.2)
+  spring-commands-rspec (= 1.0.4)
   test_after_commit (= 0.4.0)
-  timecop (= 0.7.1)
+  timecop (= 0.7.3)
   twitter (= 4.8.1)
-  twitter-text (= 1.10.0)
-  typhoeus (= 0.6.9)
-  uglifier (= 2.5.3)
+  twitter-text (= 1.11.0)
+  typhoeus (= 0.7.1)
+  uglifier (= 2.7.1)
   unicorn (= 4.8.3)
   uuid (= 2.3.7)
   webmock (= 1.20.4)
diff --git a/app/assets/images/branding-s78f0383719.png b/app/assets/images/branding-s78f0383719.png
deleted file mode 100644
index 040283d15..000000000
Binary files a/app/assets/images/branding-s78f0383719.png and /dev/null differ
diff --git a/app/assets/images/icons-sbcb16d92c7.png b/app/assets/images/icons-sbcb16d92c7.png
deleted file mode 100644
index 8ddc17847..000000000
Binary files a/app/assets/images/icons-sbcb16d92c7.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos-s87df44da1f.png b/app/assets/images/social_media_logos-s87df44da1f.png
deleted file mode 100644
index 97ca7791b..000000000
Binary files a/app/assets/images/social_media_logos-s87df44da1f.png and /dev/null differ
diff --git a/browserlist b/browserlist
new file mode 100644
index 000000000..16f871167
--- /dev/null
+++ b/browserlist
@@ -0,0 +1,2 @@
+last 2 version
+> 1%
diff --git a/config/autoprefixer.yml b/config/autoprefixer.yml
deleted file mode 100644
index 574a7098b..000000000
--- a/config/autoprefixer.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-browsers:
-  - "last 2 version"
-  - "> 1%"
diff --git a/spec/controllers/jasmine_fixtures/aspects_spec.rb b/spec/controllers/jasmine_fixtures/aspects_spec.rb
index 4d2d68108..315d46057 100644
--- a/spec/controllers/jasmine_fixtures/aspects_spec.rb
+++ b/spec/controllers/jasmine_fixtures/aspects_spec.rb
@@ -68,18 +68,7 @@ describe StreamsController, :type => :controller do
       it "generates a jasmine fixture with a post containing a video", :fixture => true do
         stub_request(
           :get,
-          "http://gdata.youtube.com/feeds/api/videos/UYrkQL1bX4A?v=2"
-        ).with(
-          :headers => {'Accept'=>'*/*'}
-        ).to_return(
-          :status  => 200,
-          :body    => "<title>LazyTown song - Cooking By The Book</title>",
-          :headers => {}
-        )
-
-        stub_request(
-          :get,
-          "http://www.youtube.com/oembed?scheme=https&format=json&frame=1&iframe=1&maxheight=420&maxwidth=420&url=http://www.youtube.com/watch?v=UYrkQL1bX4A"
+          "http://www.youtube.com/oembed?format=json&frame=1&iframe=1&maxheight=420&maxwidth=420&scheme=https?scheme=https&url=http://www.youtube.com/watch?v=UYrkQL1bX4A"
         ).with(
           :headers => {'Accept'=>'*/*'}
         ).to_return(