diff --git a/Gemfile b/Gemfile
index dc67bb74e..b11e8bb73 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,6 @@ gem 'schema_plus'
 gem 'devise'
 gem 'pundit'
 
-gem 'ancestry'
 gem 'paperclip'
 gem 'resque'
 gem 'resque-status'
@@ -21,12 +20,9 @@ gem 'highline', '~> 1.6.20'
 gem 'state_machines-activerecord'
 gem 'redis-rails'
 
-gem 'charlock_holmes'
-
 gem 'newrelic_rpm'
 
 gem 'jbuilder'
-gem 'rails3-jquery-autocomplete'
 gem 'sprockets'
 gem 'will_paginate'
 gem 'meta-tags', require: 'meta_tags'
@@ -47,18 +43,16 @@ gem 'attr_encrypted'
 
 # AngularJS related stuff
 gem 'angular-rails-templates'
-gem 'underscore-rails'
 gem 'ng-rails-csrf'
 gem 'angular-i18n'
 gem 'js-routes'
 gem 'soundmanager-rails'
-gem 'ngmin-rails'
+gem 'ngannotate-rails'
 
 gem 'time_diff'
 
 gem 'sass-rails'
 gem 'coffee-rails'
-gem 'font-awesome-rails'
 
 gem 'compass-rails'
 gem 'uglifier'
@@ -87,11 +81,6 @@ group :development do
   gem 'rails3-generators'
   gem 'hirb'
   gem 'shotgun'
-  # deploy
-  gem 'capistrano', require: false
-  gem 'rvm-capistrano', require: false
-  gem 'cape', require: false
-  gem 'capistrano_colors', require: false
   # Better Errors & RailsPanel
   gem 'better_errors'
   gem 'binding_of_caller'
diff --git a/Gemfile.lock b/Gemfile.lock
index bf47c4507..f286e896c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,9 +10,9 @@ GIT
 
 GIT
   remote: git://github.com/activeadmin/activeadmin.git
-  revision: 0ffc65a28847f46af1b707d43562eef1051b7960
+  revision: cce908d9793ba1fce8483afe5e4112f97d7d0857
   specs:
-    activeadmin (1.0.0.pre1)
+    activeadmin (1.0.0.pre2)
       arbre (~> 1.0, >= 1.0.2)
       bourbon
       coffee-rails
@@ -20,101 +20,91 @@ GIT
       formtastic_i18n
       inherited_resources (~> 1.6)
       jquery-rails
-      jquery-ui-rails (~> 5.0)
+      jquery-ui-rails
       kaminari (~> 0.15)
       rails (>= 3.2, < 5.0)
       ransack (~> 1.3)
       sass-rails
+      sprockets (< 4)
 
 GEM
   remote: http://rubygems.org/
   remote: http://rails-assets.org/
   specs:
-    actionmailer (4.2.2)
-      actionpack (= 4.2.2)
-      actionview (= 4.2.2)
-      activejob (= 4.2.2)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.2)
-      actionview (= 4.2.2)
-      activesupport (= 4.2.2)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.2)
-      activesupport (= 4.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.2)
-      activesupport (= 4.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
       globalid (>= 0.3.0)
-    activemodel (4.2.2)
-      activesupport (= 4.2.2)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.2)
-      activemodel (= 4.2.2)
-      activesupport (= 4.2.2)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
       arel (~> 6.0)
-    activesupport (4.2.2)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
-    airbrake (4.2.1)
-      builder
-      multi_json
-    ancestry (2.1.0)
-      activerecord (>= 3.0.0)
+    addressable (2.4.0)
+    airbrake (5.3.0)
+      airbrake-ruby (~> 1.3)
+    airbrake-ruby (1.3.1)
     angular-i18n (0.1.2)
-    angular-rails-templates (0.2.0)
-      railties (>= 3.1)
-      sprockets (~> 2)
+    angular-rails-templates (1.0.0)
+      railties (>= 4.2, < 6)
+      sprockets (~> 3.0)
       tilt
     arbre (1.0.3)
       activesupport (>= 3.0.0)
-    arel (6.0.0)
-    attr_encrypted (1.3.4)
-      encryptor (>= 1.3.0)
-    bcrypt (3.1.10)
+    arel (6.0.3)
+    attr_encrypted (3.0.1)
+      encryptor (~> 3.0.0)
+    bcrypt (3.1.11)
     better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bourbon (4.2.3)
+    bourbon (4.2.7)
       sass (~> 3.4)
-      thor
+      thor (~> 0.19)
     builder (3.2.2)
     callsite (0.0.11)
-    cape (1.8.0)
-    capistrano (2.15.5)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
-    capistrano_colors (0.5.5)
-    charlock_holmes (0.7.3)
-    chunky_png (1.3.4)
+    chunky_png (1.3.5)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.7)
+    cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    coderay (1.1.0)
-    coffee-rails (4.1.0)
+    coderay (1.1.1)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
+    coffee-script-source (1.10.0)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -127,49 +117,48 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    compass-rails (2.0.4)
+    compass-rails (3.0.2)
       compass (~> 1.0.0)
-      sass-rails (<= 5.0.1)
-      sprockets (< 2.13)
-    crack (0.4.2)
+      sass-rails (< 5.1)
+      sprockets (< 4.0)
+    concurrent-ruby (1.0.2)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    daemons (1.2.2)
+    daemons (1.2.3)
     debug_inspector (0.0.2)
-    devise (3.5.1)
+    devise (4.1.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 5.1)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     diff-lcs (1.2.5)
-    domain_name (0.5.24)
+    domain_name (0.5.20160310)
       unf (>= 0.0.5, < 1.0.0)
-    encryptor (1.3.0)
+    encryptor (3.0.0)
     erubis (2.7.0)
-    eventmachine (1.0.5)
-    execjs (2.5.2)
-    factory_girl (4.5.0)
+    eventmachine (1.0.9.1)
+    execjs (2.7.0)
+    factory_girl (4.7.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.5.0)
-      factory_girl (~> 4.5.0)
+    factory_girl_rails (4.7.0)
+      factory_girl (~> 4.7.0)
       railties (>= 3.0.0)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (1.2.2)
+    faraday-http-cache (1.3.0)
       faraday (~> 0.8)
-    ffi (1.9.8)
-    font-awesome-rails (4.3.0.0)
-      railties (>= 3.2, < 5.0)
-    formtastic (3.1.3)
+    ffi (1.9.10)
+    formtastic (3.1.4)
       actionpack (>= 3.2.13)
-    formtastic_i18n (0.4.1)
+    formtastic_i18n (0.6.0)
     friendly_id (5.1.0)
       activerecord (>= 4.0.0)
-    gli (2.13.1)
-    globalid (0.3.5)
+    git-version-bump (0.15.1)
+    gli (2.14.0)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
-    haml (4.0.6)
+    haml (4.0.7)
       tilt
     haml-rails (0.9.0)
       actionpack (>= 4.0.1)
@@ -180,8 +169,8 @@ GEM
     has_scope (0.6.0)
       actionpack (>= 3.2, < 5)
       activesupport (>= 3.2, < 5)
+    hashdiff (0.3.0)
     highline (1.6.21)
-    hike (1.2.3)
     hirb (0.7.3)
     html2haml (2.0.0)
       erubis (~> 2.7.0)
@@ -196,17 +185,17 @@ GEM
       has_scope (~> 0.6.0.rc)
       railties (>= 3.2, < 5)
       responders
-    its-it (1.1.1)
-    jbuilder (2.2.16)
-      activesupport (>= 3.0.0, < 5)
+    its-it (1.2.1)
+    jbuilder (2.4.1)
+      activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
-    jquery-rails (4.0.4)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.1.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
-    js-routes (1.0.1)
+    js-routes (1.2.5)
       railties (>= 3.2)
       sprockets-rails
     json (1.8.3)
@@ -214,59 +203,54 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     key_struct (0.4.2)
-    libv8 (3.16.14.7)
-    localeapp (0.9.3)
+    libv8 (3.16.14.15)
+    localeapp (1.0.2)
       gli
       i18n
       json
       rack
       rest-client
       ya2yaml
-    loofah (2.0.2)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mailcatcher (0.6.1)
-      activesupport (>= 4.0.0, < 5)
-      eventmachine (~> 1.0.0, <= 1.0.5)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mailcatcher (0.6.4)
+      activesupport (~> 4.0)
+      eventmachine (= 1.0.9.1)
       mail (~> 2.3)
+      rack (~> 1.5)
       sinatra (~> 1.2)
       skinny (~> 0.2.3)
       sqlite3 (~> 1.3)
       thin (~> 1.5.0)
-    meta-tags (2.0.0)
+    meta-tags (2.1.0)
       actionpack (>= 3.0.0)
-    meta_request (0.3.4)
+    meta_request (0.4.0)
       callsite (~> 0.0, >= 0.0.11)
       rack-contrib (~> 1.1)
-      railties (>= 3.0.0, < 5.0.0)
-    mime-types (1.25.1)
+      railties (>= 3.0.0, < 5.1.0)
+    mime-types (2.99.2)
     mimemagic (0.3.0)
-    mini_portile (0.6.2)
-    minitest (5.7.0)
-    mock_redis (0.14.1)
+    mini_portile2 (2.0.0)
+    minitest (5.9.0)
+    mock_redis (0.16.1)
     modware (0.1.2)
       its-it
       key_struct (~> 0.4)
     mono_logger (1.1.0)
-    multi_json (1.11.1)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
     nest (1.1.2)
       redis
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
-    netrc (0.10.3)
-    newrelic_rpm (3.12.0.288)
+    netrc (0.11.0)
+    newrelic_rpm (3.15.2.317)
     ng-rails-csrf (0.1.0)
-    ngmin-rails (0.4.0)
+    ngannotate-rails (1.2.2)
+      execjs
       rails (>= 3.1)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
     ohm (1.3.2)
@@ -276,82 +260,80 @@ GEM
     ohm-expire (0.1.3.2)
       ohm (>= 0.1.5)
     orm_adapter (0.5.0)
-    paperclip (4.3.0)
+    paperclip (4.3.6)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)
-    pg (0.18.2)
-    polyamorous (1.2.0)
+    pg (0.18.4)
+    polyamorous (1.3.0)
       activerecord (>= 3.0)
     posix-spawn (0.3.11)
-    puma (2.11.3)
-      rack (>= 1.1, < 2.0)
-    pundit (1.0.1)
+    puma (3.4.0)
+    pundit (1.1.0)
       activesupport (>= 3.0.0)
     pygments.rb (0.6.3)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.2.0)
-    rack (1.6.2)
-    rack-contrib (1.2.0)
-      rack (>= 0.9.1)
-    rack-mini-profiler (0.9.3)
-      rack (>= 1.1.3)
+    rack (1.6.4)
+    rack-contrib (1.4.0)
+      git-version-bump (~> 0.15)
+      rack (~> 1.4)
+    rack-mini-profiler (0.10.1)
+      rack (>= 1.2.0)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rack-throttle (0.3.0)
       rack (>= 1.0.0)
-    rack-utf8_sanitizer (1.3.0)
-      rack (~> 1.0)
-    rails (4.2.2)
-      actionmailer (= 4.2.2)
-      actionpack (= 4.2.2)
-      actionview (= 4.2.2)
-      activejob (= 4.2.2)
-      activemodel (= 4.2.2)
-      activerecord (= 4.2.2)
-      activesupport (= 4.2.2)
+    rack-utf8_sanitizer (1.3.2)
+      rack (>= 1.0, < 3.0)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.2)
+      railties (= 4.2.6)
       sprockets-rails
-    rails-assets-notifyjs (0.3.2)
+    rails-assets-notifyjs (0.4.2)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails3-generators (1.0.0)
       railties (>= 3.0.0)
-    rails3-jquery-autocomplete (1.0.15)
-      rails (>= 3.2)
-    railties (4.2.2)
-      actionpack (= 4.2.2)
-      activesupport (= 4.2.2)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    ransack (1.6.6)
+    rake (11.1.2)
+    ransack (1.7.0)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       i18n
       polyamorous (~> 1.2)
-    rb-fsevent (0.9.5)
-    rb-inotify (0.9.5)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     redis (3.0.7)
-    redis-actionpack (4.0.0)
+    redis-actionpack (4.0.1)
       actionpack (~> 4)
       redis-rack (~> 1.5.0)
       redis-store (~> 1.1.0)
-    redis-activesupport (4.0.0)
-      activesupport (~> 4)
+    redis-activesupport (4.1.5)
+      activesupport (>= 3, < 5)
       redis-store (~> 1.1.0)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
@@ -362,13 +344,13 @@ GEM
       redis-actionpack (~> 4)
       redis-activesupport (~> 4)
       redis-store (~> 1.1.0)
-    redis-semaphore (0.3.0)
+    redis-semaphore (0.3.1)
       redis
-    redis-store (1.1.4)
+    redis-store (1.1.7)
       redis (>= 2.2)
-    ref (1.0.5)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
+    ref (2.0.0)
+    responders (2.2.0)
+      railties (>= 4.2.0, < 5.1)
     resque (1.25.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
@@ -382,65 +364,63 @@ GEM
       rufus-scheduler (~> 2.0.24)
     resque-status (0.5.0)
       resque (~> 1.19)
-    resque_mailer (2.2.7)
+    resque_mailer (2.3.0)
       actionmailer (>= 3.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rr (1.1.2)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-rails (3.2.2)
+      rspec-support (~> 3.4.0)
+    rspec-rails (3.4.2)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     ruby-haml-js (0.0.5)
       execjs
       sprockets (>= 2.0.0)
-    ruby_parser (3.7.0)
+    ruby_parser (3.8.2)
       sexp_processor (~> 4.1)
     rufus-scheduler (2.0.24)
       tzinfo (>= 0.3.22)
     russian (0.6.0)
       i18n (>= 0.5.0)
-    rvm-capistrano (1.5.6)
-      capistrano (~> 2.15.4)
     safe_yaml (1.0.4)
-    sass (3.4.14)
-    sass-rails (5.0.1)
+    sass (3.4.22)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
+      tilt (>= 1.1, < 3)
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
     schema_auto_foreign_keys (0.1.0)
       schema_plus_foreign_keys (~> 0.1)
       schema_plus_indexes (~> 0.2)
-    schema_monkey (2.1.0)
-      activerecord (~> 4.2)
+    schema_monkey (2.1.4)
+      activerecord (>= 4.2)
       its-it
       modware (~> 0.1)
-    schema_plus (2.0.0)
+    schema_plus (2.0.1)
       activerecord (~> 4.2)
       schema_auto_foreign_keys (~> 0.1)
       schema_monkey (~> 2.1)
       schema_plus_columns (~> 0.1)
-      schema_plus_core (~> 0.4)
+      schema_plus_core (~> 1.0)
       schema_plus_db_default (~> 0.1)
       schema_plus_default_expr (~> 0.1)
       schema_plus_enums (~> 0.1)
@@ -452,36 +432,37 @@ GEM
     schema_plus_columns (0.1.0)
       activerecord (~> 4.2)
       schema_plus_indexes (~> 0.1)
-    schema_plus_core (0.5.0)
+    schema_plus_core (1.0.0)
       activerecord (~> 4.2)
       schema_monkey (~> 2.1)
-    schema_plus_db_default (0.1.0)
+    schema_plus_db_default (0.1.1)
       activerecord (~> 4.2)
-      schema_plus_core (~> 0.2, >= 0.2.1)
-    schema_plus_default_expr (0.1.0)
+      schema_plus_core (~> 1.0)
+    schema_plus_default_expr (0.1.1)
       activerecord (~> 4.2)
-      schema_plus_core (~> 0.2, >= 0.2.1)
-    schema_plus_enums (0.1.0)
+      schema_plus_core (~> 1.0)
+    schema_plus_enums (0.1.2)
       activerecord (~> 4.2)
-      schema_plus_core (~> 0.2, >= 0.2.1)
-    schema_plus_foreign_keys (0.1.2)
+      schema_plus_core (~> 1.0)
+    schema_plus_foreign_keys (0.1.4)
       activerecord (~> 4.2)
-      schema_plus_core (~> 0.5)
+      schema_plus_core (~> 1.0)
       valuable
-    schema_plus_indexes (0.2.0)
+    schema_plus_indexes (0.2.1)
       activerecord (~> 4.2)
-      schema_plus_core (~> 0.1)
-    schema_plus_pg_indexes (0.1.4)
+      schema_plus_core (~> 1.0)
+    schema_plus_pg_indexes (0.1.10)
       activerecord (~> 4.2)
+      schema_plus_core (~> 1.0)
       schema_plus_indexes (~> 0.1, >= 0.1.3)
-    schema_plus_tables (0.1.0)
+    schema_plus_tables (0.1.1)
       activerecord (~> 4.2)
-      schema_plus_core (~> 0.2)
-    schema_plus_views (0.2.0)
+      schema_plus_core (~> 1.0)
+    schema_plus_views (0.3.1)
       activerecord (~> 4.2)
-      schema_plus_core (~> 0.1)
+      schema_plus_core (~> 1.0)
     scrivener (0.0.3)
-    sexp_processor (4.6.0)
+    sexp_processor (4.7.0)
     shotgun (0.9.1)
       rack (>= 1.0)
     shoulda (3.5.0)
@@ -493,38 +474,36 @@ GEM
     simple_form (3.1.0.rc2)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
-    sinatra (1.4.6)
-      rack (~> 1.4)
+    sinatra (1.4.7)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    sitemap_generator (5.0.5)
+    sitemap_generator (5.1.0)
       builder
-    skinny (0.2.3)
+    skinny (0.2.4)
       eventmachine (~> 1.0.0)
-      thin (~> 1.5.0)
-    slim (3.0.6)
-      temple (~> 0.7.3)
+      thin (>= 1.5, < 1.7)
+    slim (3.0.7)
+      temple (~> 0.7.6)
       tilt (>= 1.3.3, < 2.1)
     soundmanager-rails (1.0.1)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.10)
-    state_machines (0.2.2)
-    state_machines-activemodel (0.1.2)
-      activemodel (~> 4.1)
-      state_machines (~> 0.2.0)
-    state_machines-activerecord (0.2.0)
-      activerecord (~> 4.1)
-      state_machines-activemodel (~> 0.1.0)
-    temple (0.7.5)
-    test_after_commit (0.4.1)
+    sprockets (3.6.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.4)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.11)
+    state_machines (0.4.0)
+    state_machines-activemodel (0.4.0)
+      activemodel (>= 4.1, < 5.1)
+      state_machines (>= 0.4.0)
+    state_machines-activerecord (0.4.0)
+      activerecord (>= 4.1, < 5.1)
+      state_machines-activemodel (>= 0.3.0)
+    temple (0.7.7)
+    test_after_commit (1.0.0)
       activerecord (>= 3.2)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
@@ -535,29 +514,28 @@ GEM
       rack (>= 1.0.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
+    tilt (2.0.4)
     time_diff (0.3.0)
       activesupport
       i18n
-    timecop (0.7.4)
+    timecop (0.8.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.1)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    underscore-rails (1.8.2)
+    uglifier (3.0.0)
+      execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
-    valuable (0.9.9)
+    unf_ext (0.0.7.2)
+    valuable (0.9.12)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    warden (1.2.3)
+    warden (1.2.6)
       rack (>= 1.0)
-    webmock (1.21.0)
+    webmock (2.0.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    will_paginate (3.0.7)
+      hashdiff
+    will_paginate (3.1.0)
     ya2yaml (0.31)
     yajl-ruby (1.2.1)
 
@@ -567,22 +545,16 @@ PLATFORMS
 DEPENDENCIES
   activeadmin!
   airbrake
-  ancestry
   angular-i18n
   angular-rails-templates
   attr_encrypted
   better_errors
   binding_of_caller
-  cape
-  capistrano
-  capistrano_colors
-  charlock_holmes
   coffee-rails
   compass-rails
   devise
   factory_girl_rails
   faraday-http-cache
-  font-awesome-rails
   friendly_id
   haml-rails
   highline (~> 1.6.20)
@@ -596,7 +568,7 @@ DEPENDENCIES
   mock_redis
   newrelic_rpm
   ng-rails-csrf
-  ngmin-rails
+  ngannotate-rails
   octokit (~> 4.0)
   ohm (~> 1.3.2)
   ohm-expire (~> 0.1.3)
@@ -612,7 +584,6 @@ DEPENDENCIES
   rails
   rails-assets-notifyjs!
   rails3-generators
-  rails3-jquery-autocomplete
   rake
   redis-rails
   redis-semaphore
@@ -625,7 +596,6 @@ DEPENDENCIES
   rspec-rails
   ruby-haml-js
   russian
-  rvm-capistrano
   sass-rails
   schema_plus
   shotgun
@@ -643,7 +613,6 @@ DEPENDENCIES
   time_diff
   timecop
   uglifier
-  underscore-rails
   webmock
   will_paginate
 
diff --git a/app/assets/images/answers.png b/app/assets/images/answers.png
deleted file mode 100644
index 86d8172e5..000000000
Binary files a/app/assets/images/answers.png and /dev/null differ
diff --git a/app/assets/images/ava-admin.png b/app/assets/images/ava-admin.png
deleted file mode 100644
index b5927a3fd..000000000
Binary files a/app/assets/images/ava-admin.png and /dev/null differ
diff --git a/app/assets/images/bg-droplist.png b/app/assets/images/bg-droplist.png
deleted file mode 100644
index 2c5a4309b..000000000
Binary files a/app/assets/images/bg-droplist.png and /dev/null differ
diff --git a/app/assets/images/bg-signup.png b/app/assets/images/bg-signup.png
deleted file mode 100644
index 79676f161..000000000
Binary files a/app/assets/images/bg-signup.png and /dev/null differ
diff --git a/app/assets/images/bg-sortable.png b/app/assets/images/bg-sortable.png
deleted file mode 100644
index b2598acb2..000000000
Binary files a/app/assets/images/bg-sortable.png and /dev/null differ
diff --git a/app/assets/images/bg.png b/app/assets/images/bg.png
deleted file mode 100644
index 62e74e049..000000000
Binary files a/app/assets/images/bg.png and /dev/null differ
diff --git a/app/assets/images/bg_blue.png b/app/assets/images/bg_blue.png
deleted file mode 100644
index ecfede360..000000000
Binary files a/app/assets/images/bg_blue.png and /dev/null differ
diff --git a/app/assets/images/button-green-disabled.png b/app/assets/images/button-green-disabled.png
deleted file mode 100644
index 21159cb78..000000000
Binary files a/app/assets/images/button-green-disabled.png and /dev/null differ
diff --git a/app/assets/images/button-green-hover.png b/app/assets/images/button-green-hover.png
deleted file mode 100644
index b639aa0ab..000000000
Binary files a/app/assets/images/button-green-hover.png and /dev/null differ
diff --git a/app/assets/images/button-green-normal.png b/app/assets/images/button-green-normal.png
deleted file mode 100644
index 5fb90051c..000000000
Binary files a/app/assets/images/button-green-normal.png and /dev/null differ
diff --git a/app/assets/images/button-green-press.png b/app/assets/images/button-green-press.png
deleted file mode 100644
index 66ce78c4a..000000000
Binary files a/app/assets/images/button-green-press.png and /dev/null differ
diff --git a/app/assets/images/check.png b/app/assets/images/check.png
deleted file mode 100644
index 21d2b3ea3..000000000
Binary files a/app/assets/images/check.png and /dev/null differ
diff --git a/app/assets/images/checkbox-main.png b/app/assets/images/checkbox-main.png
deleted file mode 100644
index 44aa8b14b..000000000
Binary files a/app/assets/images/checkbox-main.png and /dev/null differ
diff --git a/app/assets/images/checkbox.png b/app/assets/images/checkbox.png
deleted file mode 100644
index 1943af638..000000000
Binary files a/app/assets/images/checkbox.png and /dev/null differ
diff --git a/app/assets/images/choose.png b/app/assets/images/choose.png
deleted file mode 100644
index 768c38db7..000000000
Binary files a/app/assets/images/choose.png and /dev/null differ
diff --git a/app/assets/images/code.png b/app/assets/images/code.png
deleted file mode 100644
index 7a869da48..000000000
Binary files a/app/assets/images/code.png and /dev/null differ
diff --git a/app/assets/images/error-arrow.png b/app/assets/images/error-arrow.png
deleted file mode 100644
index 3e2e9734f..000000000
Binary files a/app/assets/images/error-arrow.png and /dev/null differ
diff --git a/app/assets/images/error-groups.png b/app/assets/images/error-groups.png
deleted file mode 100644
index 377b18da8..000000000
Binary files a/app/assets/images/error-groups.png and /dev/null differ
diff --git a/app/assets/images/error-message.png b/app/assets/images/error-message.png
deleted file mode 100644
index 029d009fe..000000000
Binary files a/app/assets/images/error-message.png and /dev/null differ
diff --git a/app/assets/images/expand-gray.png b/app/assets/images/expand-gray.png
deleted file mode 100644
index cb8bbd46f..000000000
Binary files a/app/assets/images/expand-gray.png and /dev/null differ
diff --git a/app/assets/images/expand-gray2.png b/app/assets/images/expand-gray2.png
deleted file mode 100644
index c49b0b21b..000000000
Binary files a/app/assets/images/expand-gray2.png and /dev/null differ
diff --git a/app/assets/images/expand-white.png b/app/assets/images/expand-white.png
deleted file mode 100644
index 78dc7c9fe..000000000
Binary files a/app/assets/images/expand-white.png and /dev/null differ
diff --git a/app/assets/images/expand.png b/app/assets/images/expand.png
deleted file mode 100644
index ee33c14c5..000000000
Binary files a/app/assets/images/expand.png and /dev/null differ
diff --git a/app/assets/images/facebook.png b/app/assets/images/facebook.png
deleted file mode 100644
index 0a1d093be..000000000
Binary files a/app/assets/images/facebook.png and /dev/null differ
diff --git a/app/assets/images/fb-image.png b/app/assets/images/fb-image.png
deleted file mode 100644
index 2ba659fc9..000000000
Binary files a/app/assets/images/fb-image.png and /dev/null differ
diff --git a/app/assets/images/feedback.png b/app/assets/images/feedback.png
deleted file mode 100644
index cc4424e83..000000000
Binary files a/app/assets/images/feedback.png and /dev/null differ
diff --git a/app/assets/images/flag.png b/app/assets/images/flag.png
deleted file mode 100644
index e38dfa577..000000000
Binary files a/app/assets/images/flag.png and /dev/null differ
diff --git a/app/assets/images/folder-submodule.png b/app/assets/images/folder-submodule.png
deleted file mode 100644
index 651ee7423..000000000
Binary files a/app/assets/images/folder-submodule.png and /dev/null differ
diff --git a/app/assets/images/folder.png b/app/assets/images/folder.png
deleted file mode 100644
index a796a32b1..000000000
Binary files a/app/assets/images/folder.png and /dev/null differ
diff --git a/app/assets/images/gears.png b/app/assets/images/gears.png
deleted file mode 100644
index e4bc04651..000000000
Binary files a/app/assets/images/gears.png and /dev/null differ
diff --git a/app/assets/images/github.png b/app/assets/images/github.png
deleted file mode 100644
index 4f358d1cc..000000000
Binary files a/app/assets/images/github.png and /dev/null differ
diff --git a/app/assets/images/glyphicons-halflings.png b/app/assets/images/glyphicons-halflings.png
deleted file mode 100644
index a99699932..000000000
Binary files a/app/assets/images/glyphicons-halflings.png and /dev/null differ
diff --git a/app/assets/images/google.png b/app/assets/images/google.png
deleted file mode 100644
index 7aa07ee35..000000000
Binary files a/app/assets/images/google.png and /dev/null differ
diff --git a/app/assets/images/group16.png b/app/assets/images/group16.png
deleted file mode 100644
index 9ce562231..000000000
Binary files a/app/assets/images/group16.png and /dev/null differ
diff --git a/app/assets/images/group16b.png b/app/assets/images/group16b.png
deleted file mode 100644
index 7576d9909..000000000
Binary files a/app/assets/images/group16b.png and /dev/null differ
diff --git a/app/assets/images/group16g.png b/app/assets/images/group16g.png
deleted file mode 100644
index b05df6de4..000000000
Binary files a/app/assets/images/group16g.png and /dev/null differ
diff --git a/app/assets/images/group32.png b/app/assets/images/group32.png
deleted file mode 100644
index 8cd932407..000000000
Binary files a/app/assets/images/group32.png and /dev/null differ
diff --git a/app/assets/images/group32g.png b/app/assets/images/group32g.png
deleted file mode 100644
index a9f105b1b..000000000
Binary files a/app/assets/images/group32g.png and /dev/null differ
diff --git a/app/assets/images/line_comment.png b/app/assets/images/line_comment.png
deleted file mode 100644
index 544cb0714..000000000
Binary files a/app/assets/images/line_comment.png and /dev/null differ
diff --git a/app/assets/images/loading-large.gif b/app/assets/images/loading-large.gif
deleted file mode 100644
index 926c3d9d8..000000000
Binary files a/app/assets/images/loading-large.gif and /dev/null differ
diff --git a/app/assets/images/loading-small.gif b/app/assets/images/loading-small.gif
deleted file mode 100644
index e6fdced3e..000000000
Binary files a/app/assets/images/loading-small.gif and /dev/null differ
diff --git a/app/assets/images/lock.png b/app/assets/images/lock.png
deleted file mode 100644
index f1e6f3038..000000000
Binary files a/app/assets/images/lock.png and /dev/null differ
diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png
deleted file mode 100644
index e78e588e0..000000000
Binary files a/app/assets/images/logo.png and /dev/null differ
diff --git a/app/assets/images/menu-hover.png b/app/assets/images/menu-hover.png
deleted file mode 100644
index 8883a2116..000000000
Binary files a/app/assets/images/menu-hover.png and /dev/null differ
diff --git a/app/assets/images/open.png b/app/assets/images/open.png
deleted file mode 100644
index b979e7646..000000000
Binary files a/app/assets/images/open.png and /dev/null differ
diff --git a/app/assets/images/page-bg.png b/app/assets/images/page-bg.png
deleted file mode 100644
index f81678dec..000000000
Binary files a/app/assets/images/page-bg.png and /dev/null differ
diff --git a/app/assets/images/profile-hover.png b/app/assets/images/profile-hover.png
deleted file mode 100644
index 09427d06b..000000000
Binary files a/app/assets/images/profile-hover.png and /dev/null differ
diff --git a/app/assets/images/radio.png b/app/assets/images/radio.png
deleted file mode 100644
index eb7f49f8a..000000000
Binary files a/app/assets/images/radio.png and /dev/null differ
diff --git a/app/assets/images/registration.png b/app/assets/images/registration.png
deleted file mode 100644
index 7c2e93cb8..000000000
Binary files a/app/assets/images/registration.png and /dev/null differ
diff --git a/app/assets/images/round.png b/app/assets/images/round.png
deleted file mode 100644
index 1968a568a..000000000
Binary files a/app/assets/images/round.png and /dev/null differ
diff --git a/app/assets/images/search-button.png b/app/assets/images/search-button.png
deleted file mode 100644
index 7a9e40bc4..000000000
Binary files a/app/assets/images/search-button.png and /dev/null differ
diff --git a/app/assets/images/selects-2.png b/app/assets/images/selects-2.png
deleted file mode 100644
index d7be30b97..000000000
Binary files a/app/assets/images/selects-2.png and /dev/null differ
diff --git a/app/assets/images/selects-focus.png b/app/assets/images/selects-focus.png
deleted file mode 100644
index 2e4359dac..000000000
Binary files a/app/assets/images/selects-focus.png and /dev/null differ
diff --git a/app/assets/images/square.png b/app/assets/images/square.png
deleted file mode 100644
index f2a5fda12..000000000
Binary files a/app/assets/images/square.png and /dev/null differ
diff --git a/app/assets/images/submenu-hover.png b/app/assets/images/submenu-hover.png
deleted file mode 100644
index eda9a1a1a..000000000
Binary files a/app/assets/images/submenu-hover.png and /dev/null differ
diff --git a/app/assets/images/switch-off.png b/app/assets/images/switch-off.png
deleted file mode 100644
index e119baf8e..000000000
Binary files a/app/assets/images/switch-off.png and /dev/null differ
diff --git a/app/assets/images/switch-on.png b/app/assets/images/switch-on.png
deleted file mode 100644
index cdfa3e37e..000000000
Binary files a/app/assets/images/switch-on.png and /dev/null differ
diff --git a/app/assets/images/table-down.png b/app/assets/images/table-down.png
deleted file mode 100644
index 0a6e66179..000000000
Binary files a/app/assets/images/table-down.png and /dev/null differ
diff --git a/app/assets/images/table-header.png b/app/assets/images/table-header.png
deleted file mode 100644
index ff7181431..000000000
Binary files a/app/assets/images/table-header.png and /dev/null differ
diff --git a/app/assets/images/table-sort.png b/app/assets/images/table-sort.png
deleted file mode 100644
index 765c685e2..000000000
Binary files a/app/assets/images/table-sort.png and /dev/null differ
diff --git a/app/assets/images/table-up.png b/app/assets/images/table-up.png
deleted file mode 100644
index 53b1671cb..000000000
Binary files a/app/assets/images/table-up.png and /dev/null differ
diff --git a/app/assets/images/top-left-tour.png b/app/assets/images/top-left-tour.png
deleted file mode 100644
index e5fa1be74..000000000
Binary files a/app/assets/images/top-left-tour.png and /dev/null differ
diff --git a/app/assets/images/top-left.png b/app/assets/images/top-left.png
deleted file mode 100644
index 3e3142321..000000000
Binary files a/app/assets/images/top-left.png and /dev/null differ
diff --git a/app/assets/images/top-middle.png b/app/assets/images/top-middle.png
deleted file mode 100644
index 2d01d9206..000000000
Binary files a/app/assets/images/top-middle.png and /dev/null differ
diff --git a/app/assets/images/top-right-tour.png b/app/assets/images/top-right-tour.png
deleted file mode 100644
index caa97d44c..000000000
Binary files a/app/assets/images/top-right-tour.png and /dev/null differ
diff --git a/app/assets/images/top-right.png b/app/assets/images/top-right.png
deleted file mode 100644
index 5e6831238..000000000
Binary files a/app/assets/images/top-right.png and /dev/null differ
diff --git a/app/assets/images/tour-bg.png b/app/assets/images/tour-bg.png
deleted file mode 100644
index 723650110..000000000
Binary files a/app/assets/images/tour-bg.png and /dev/null differ
diff --git a/app/assets/images/tour-top-eng.png b/app/assets/images/tour-top-eng.png
deleted file mode 100644
index 497b2ab62..000000000
Binary files a/app/assets/images/tour-top-eng.png and /dev/null differ
diff --git a/app/assets/images/tour-top.png b/app/assets/images/tour-top.png
deleted file mode 100644
index 12aacf07f..000000000
Binary files a/app/assets/images/tour-top.png and /dev/null differ
diff --git a/app/assets/images/tour/annotation.png b/app/assets/images/tour/annotation.png
deleted file mode 100644
index 2ebdc2095..000000000
Binary files a/app/assets/images/tour/annotation.png and /dev/null differ
diff --git a/app/assets/images/tour/big/annotation.png b/app/assets/images/tour/big/annotation.png
deleted file mode 100644
index bd513b32f..000000000
Binary files a/app/assets/images/tour/big/annotation.png and /dev/null differ
diff --git a/app/assets/images/tour/big/builds.png b/app/assets/images/tour/big/builds.png
deleted file mode 100644
index 0c50f71d0..000000000
Binary files a/app/assets/images/tour/big/builds.png and /dev/null differ
diff --git a/app/assets/images/tour/big/control.png b/app/assets/images/tour/big/control.png
deleted file mode 100644
index cb8b9f4b0..000000000
Binary files a/app/assets/images/tour/big/control.png and /dev/null differ
diff --git a/app/assets/images/tour/big/edit.png b/app/assets/images/tour/big/edit.png
deleted file mode 100644
index a41f93be4..000000000
Binary files a/app/assets/images/tour/big/edit.png and /dev/null differ
diff --git a/app/assets/images/tour/big/git.png b/app/assets/images/tour/big/git.png
deleted file mode 100644
index 9898b998d..000000000
Binary files a/app/assets/images/tour/big/git.png and /dev/null differ
diff --git a/app/assets/images/tour/big/history.png b/app/assets/images/tour/big/history.png
deleted file mode 100644
index b1d06f382..000000000
Binary files a/app/assets/images/tour/big/history.png and /dev/null differ
diff --git a/app/assets/images/tour/big/monitoring.png b/app/assets/images/tour/big/monitoring.png
deleted file mode 100644
index b9357d0d7..000000000
Binary files a/app/assets/images/tour/big/monitoring.png and /dev/null differ
diff --git a/app/assets/images/tour/big/repo.png b/app/assets/images/tour/big/repo.png
deleted file mode 100644
index f9291bd33..000000000
Binary files a/app/assets/images/tour/big/repo.png and /dev/null differ
diff --git a/app/assets/images/tour/big/source.png b/app/assets/images/tour/big/source.png
deleted file mode 100644
index 3b747ef55..000000000
Binary files a/app/assets/images/tour/big/source.png and /dev/null differ
diff --git a/app/assets/images/tour/big/tracker.png b/app/assets/images/tour/big/tracker.png
deleted file mode 100644
index 5263e4400..000000000
Binary files a/app/assets/images/tour/big/tracker.png and /dev/null differ
diff --git a/app/assets/images/tour/builds.png b/app/assets/images/tour/builds.png
deleted file mode 100644
index 1caf4c4bd..000000000
Binary files a/app/assets/images/tour/builds.png and /dev/null differ
diff --git a/app/assets/images/tour/control.png b/app/assets/images/tour/control.png
deleted file mode 100644
index 54e764009..000000000
Binary files a/app/assets/images/tour/control.png and /dev/null differ
diff --git a/app/assets/images/tour/edit.png b/app/assets/images/tour/edit.png
deleted file mode 100644
index d66c72d66..000000000
Binary files a/app/assets/images/tour/edit.png and /dev/null differ
diff --git a/app/assets/images/tour/git.png b/app/assets/images/tour/git.png
deleted file mode 100644
index d5af3df4c..000000000
Binary files a/app/assets/images/tour/git.png and /dev/null differ
diff --git a/app/assets/images/tour/history.png b/app/assets/images/tour/history.png
deleted file mode 100644
index 944f65477..000000000
Binary files a/app/assets/images/tour/history.png and /dev/null differ
diff --git a/app/assets/images/tour/monitoring.png b/app/assets/images/tour/monitoring.png
deleted file mode 100644
index 825cc760c..000000000
Binary files a/app/assets/images/tour/monitoring.png and /dev/null differ
diff --git a/app/assets/images/tour/repo.png b/app/assets/images/tour/repo.png
deleted file mode 100644
index b4a6c5e63..000000000
Binary files a/app/assets/images/tour/repo.png and /dev/null differ
diff --git a/app/assets/images/tour/source.png b/app/assets/images/tour/source.png
deleted file mode 100644
index 595328352..000000000
Binary files a/app/assets/images/tour/source.png and /dev/null differ
diff --git a/app/assets/images/tour/tracker.png b/app/assets/images/tour/tracker.png
deleted file mode 100644
index 264dbf007..000000000
Binary files a/app/assets/images/tour/tracker.png and /dev/null differ
diff --git a/app/assets/images/trigger.gif b/app/assets/images/trigger.gif
deleted file mode 100644
index 4be7710be..000000000
Binary files a/app/assets/images/trigger.gif and /dev/null differ
diff --git a/app/assets/images/unlock.png b/app/assets/images/unlock.png
deleted file mode 100644
index a92896979..000000000
Binary files a/app/assets/images/unlock.png and /dev/null differ
diff --git a/app/assets/images/unlock2.png b/app/assets/images/unlock2.png
deleted file mode 100644
index de42603d1..000000000
Binary files a/app/assets/images/unlock2.png and /dev/null differ
diff --git a/app/assets/images/user16.png b/app/assets/images/user16.png
deleted file mode 100644
index d308dc1db..000000000
Binary files a/app/assets/images/user16.png and /dev/null differ
diff --git a/app/assets/images/user16b.png b/app/assets/images/user16b.png
deleted file mode 100644
index 1bc569374..000000000
Binary files a/app/assets/images/user16b.png and /dev/null differ
diff --git a/app/assets/images/user16g.png b/app/assets/images/user16g.png
deleted file mode 100644
index da808f5db..000000000
Binary files a/app/assets/images/user16g.png and /dev/null differ
diff --git a/app/assets/images/user32.png b/app/assets/images/user32.png
deleted file mode 100644
index 8dd09695a..000000000
Binary files a/app/assets/images/user32.png and /dev/null differ
diff --git a/app/assets/images/user32g.png b/app/assets/images/user32g.png
deleted file mode 100644
index 34be62965..000000000
Binary files a/app/assets/images/user32g.png and /dev/null differ
diff --git a/app/assets/images/x-label.png b/app/assets/images/x-label.png
deleted file mode 100644
index 40e368990..000000000
Binary files a/app/assets/images/x-label.png and /dev/null differ
diff --git a/app/assets/images/x.png b/app/assets/images/x.png
deleted file mode 100644
index ae3cb9937..000000000
Binary files a/app/assets/images/x.png and /dev/null differ
diff --git a/app/assets/images/zip.png b/app/assets/images/zip.png
deleted file mode 100644
index 0d5a3744f..000000000
Binary files a/app/assets/images/zip.png and /dev/null differ
diff --git a/app/assets/javascripts/new_application.js b/app/assets/javascripts/new_application.js
index ea716a30f..2f1fc1a02 100644
--- a/app/assets/javascripts/new_application.js
+++ b/app/assets/javascripts/new_application.js
@@ -10,6 +10,4 @@
 
 //= require_tree ./angularjs
 
-//= require underscore
-
 //= require lib/Chart
\ No newline at end of file
diff --git a/app/assets/stylesheets/new_application.scss b/app/assets/stylesheets/new_application.scss
index 2aa275d46..b33ec8be9 100644
--- a/app/assets/stylesheets/new_application.scss
+++ b/app/assets/stylesheets/new_application.scss
@@ -37,6 +37,5 @@ $blockquote-font-size:                     14px;
 
 @import "rdash";
 @import "timeline";
-@import "font-awesome";
-@import "loading-bar";
+/*@import "font-awesome";*/
 @import "pygments";
diff --git a/app/jobs/autostart_builds_daily_job.rb b/app/jobs/autostart_builds_daily_job.rb
new file mode 100644
index 000000000..43216a568
--- /dev/null
+++ b/app/jobs/autostart_builds_daily_job.rb
@@ -0,0 +1,8 @@
+class AutostartBuildsDailyJob
+  @queue = :low
+
+  def self.perform
+    Product.autostart_iso_builds_once_a_day
+    Project.autostart_build_lists_once_a_day
+  end
+end
\ No newline at end of file
diff --git a/app/jobs/autostart_builds_once_every_twelve_hours_job.rb b/app/jobs/autostart_builds_once_every_twelve_hours_job.rb
new file mode 100644
index 000000000..1f519ad66
--- /dev/null
+++ b/app/jobs/autostart_builds_once_every_twelve_hours_job.rb
@@ -0,0 +1,8 @@
+class AutostartBuildsOnceEveryTwelveHoursJob
+  @queue = :low
+
+  def self.perform
+    Product.autostart_iso_builds_once_a_12_hours
+    Project.autostart_build_lists_once_a_12_hours
+  end
+end
\ No newline at end of file
diff --git a/app/jobs/autostart_builds_weekly_job.rb b/app/jobs/autostart_builds_weekly_job.rb
new file mode 100644
index 000000000..405cf0f16
--- /dev/null
+++ b/app/jobs/autostart_builds_weekly_job.rb
@@ -0,0 +1,8 @@
+class AutostartBuildsWeeklyJob
+  @queue = :low
+
+  def self.perform
+    Product.autostart_iso_builds_once_a_week
+    Project.autostart_build_lists_once_a_week
+  end
+end
\ No newline at end of file
diff --git a/app/jobs/build_lists/build_canceling_destroy_job.rb b/app/jobs/build_lists/build_canceling_destroy_job.rb
new file mode 100644
index 000000000..f6ef363bd
--- /dev/null
+++ b/app/jobs/build_lists/build_canceling_destroy_job.rb
@@ -0,0 +1,13 @@
+module BuildLists
+  class BuildCancelingDestroyJob
+    @queue = :low
+
+    def self.perform
+      scope = BuildList.for_status(BuildList::BUILD_CANCELING).for_notified_date_period(nil, 1.hours.ago)
+
+      scope.find_each(batch_size: 50) do |bl|
+        bl.destroy
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/models/project.rb b/app/models/project.rb
index 352b31df0..a6de1662a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1,8 +1,6 @@
 require 'base64'
 
 class Project < ActiveRecord::Base
-  has_ancestry orphan_strategy: :adopt # we replace a 'path' method in the Git module
-
   include Autostart
   include Owner
   include UrlHelper
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index c6a33d50c..52eb47467 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -9,6 +9,7 @@ html
       = auto_discovery_link_tag :atom, atom_activity_feeds_path(format: 'atom', token: current_user.authentication_token), title: t("layout.atom_link_tag_title", nickname: current_user.uname, app_name: APP_CONFIG['project_name'])
     script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js" type="text/javascript"
     link href='//netdna.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css' rel='stylesheet'
+    link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous"
     link href='https://fonts.googleapis.com/css?family=Montserrat' rel='stylesheet' type='text/css'
     == stylesheet_link_tag 'new_application', cache: 'application'
 
@@ -52,11 +53,12 @@ html
 
           == yield
 
+  script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js" type="text/javascript"
   script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.12.0/moment.min.js" type="text/javascript"
-  script src="//ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular-resource.js" type="text/javascript"
-  script src="//ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular-cookies.js" type="text/javascript"
-  script src="//ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular-sanitize.js" type="text/javascript"
-  script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/1.2.5/ui-bootstrap-tpls.js" type="text/javascript"
+  script src="//ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular-resource.min.js" type="text/javascript"
+  script src="//ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular-cookies.min.js" type="text/javascript"
+  script src="//ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular-sanitize.min.js" type="text/javascript"
+  script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/1.2.5/ui-bootstrap-tpls.min.js" type="text/javascript"
   script src="https://code.jquery.com/jquery-2.2.2.min.js" integrity="sha256-36cp2Co+/62rEAAYHLmRCPIych47CvdM+uTBJwSzWjI=" crossorigin="anonymous"
   == javascript_include_tag 'new_application', cache: 'application'
   == yield :additional_scripts if content_for?(:additional_scripts)
diff --git a/app/views/platforms/repositories/_proj_ajax.json.jbuilder b/app/views/platforms/repositories/_proj_ajax.json.jbuilder
index 1b332ec60..d193018cf 100644
--- a/app/views/platforms/repositories/_proj_ajax.json.jbuilder
+++ b/app/views/platforms/repositories/_proj_ajax.json.jbuilder
@@ -1,5 +1,5 @@
 json.projects @projects do |project|
-  json.visibility_class fa_visibility_icon(project)
+  #json.visibility_class fa_visibility_icon(project)
   json.path             project_build_lists_path(project.name_with_owner)
   json.name             project.name_with_owner
   json.add_path         url_for(controller: :repositories, action: :add_project, project_id: project.id)
diff --git a/app/views/platforms/repositories/_project.json.jbuilder b/app/views/platforms/repositories/_project.json.jbuilder
index 843fcb711..75b84afbb 100644
--- a/app/views/platforms/repositories/_project.json.jbuilder
+++ b/app/views/platforms/repositories/_project.json.jbuilder
@@ -2,7 +2,7 @@ json.total_items @total_items
 
 json.projects @projects do |project|
   json.id               project.id
-  json.visibility_class fa_visibility_icon(project)
+  #json.visibility_class fa_visibility_icon(project)
   json.path             project_build_lists_path(project.name_with_owner)
   json.name             project.name_with_owner
   if policy(@repository).remove_project?
diff --git a/config/environments/development.rb b/config/environments/development.rb
index c88f525a6..9f0be1b7f 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,18 +1,18 @@
 # https://github.com/rails/rails/issues/2639#issuecomment-6591735
-class DisableAssetsLogger
-  def initialize(app)
-    @app = app
-    Rails.application.assets.logger = Logger.new('/dev/null')
-  end
+#class DisableAssetsLogger
+#  def initialize(app)
+#    @app = app
+#    Rails.application.assets.logger = Logger.new('/dev/null')
+#  end
 
-  def call(env)
-    previous_level = Rails.logger.level
-    Rails.logger.level = Logger::ERROR if env['PATH_INFO'].index("/assets/") == 0
-    @app.call(env)
-  ensure
-    Rails.logger.level = previous_level
-  end
-end
+#  def call(env)
+#    previous_level = Rails.logger.level
+#    Rails.logger.level = Logger::ERROR if env['PATH_INFO'].index("/assets/") == 0
+#    @app.call(env)
+#  ensure
+#    Rails.logger.level = previous_level
+#  end
+#end
 
 Rails.application.configure do
   # In the development environment your application's code is reloaded on
@@ -61,7 +61,7 @@ Rails.application.configure do
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 
-  config.middleware.insert_before Rails::Rack::Logger, DisableAssetsLogger
+  #config.middleware.insert_before Rails::Rack::Logger, DisableAssetsLogger
 
   config.log_redis = true
 end
diff --git a/config/initializers/airbrake.rb b/config/initializers/airbrake.rb
index eed39ceb6..48faf9103 100644
--- a/config/initializers/airbrake.rb
+++ b/config/initializers/airbrake.rb
@@ -1,8 +1,8 @@
 require 'airbrake'
 
-Airbrake.configure do |config|
-  config.api_key = APP_CONFIG['airbrake']['api_key']
-  config.host    = APP_CONFIG['airbrake']['host']
-  config.port    = 80
-  config.secure  = config.port == 443
-end
+#Airbrake.configure do |config|
+#  config.project_key = APP_CONFIG['airbrake']['api_key']
+#  config.host    = APP_CONFIG['airbrake']['host']
+  #config.port    = 80
+  #config.secure  = config.port == 443
+#end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index b7742fc20..675e9b746 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -6,6 +6,6 @@ Rails.application.config.assets.version = '1.0'
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 Rails.application.config.assets.precompile += %w(
-  login.css login.js reg_session.css tour.css tour.js gollum/editor/langs/*.js
+  login.css login.js reg_session.css
   moment/ru.js new_application.css new_application.js angular-locale_ru-ru.js
 )
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
deleted file mode 100644
index 4ba1dc532..000000000
--- a/config/initializers/mime_types.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Add new mime types for use in respond_to blocks:
-# Mime::Type.register "text/richtext", :rtf
-
-Mime::Type.register "text/plain", 'diff'
-Mime::Type.register "text/plain", 'patch'
-
-# add rpm spec as mime type for *.spec files
-[["text/x-python",        ['py'],        '8bit'],
- ["text/x-rpm-spec",      ['spec'],      '8bit'],
- ["application/x-csrc",   ['h', 'c'],    '8bit'],
- ["application/x-c++src", ['cpp', 'cc'], '8bit'],
- ["application/x-csharp", ['cs'],        '8bit'],
- ["text/x-diff",          ['diff'],      '8bit'],
- ["text/x-markdown",      ['md'],        '8bit'],
- ["application/x-rpm",    ['rpm'],       '8bit']
-].each do |type|
-  MIME::Types.add MIME::Type.from_array(type)
-end
diff --git a/config/resque_schedule.yml b/config/resque_schedule.yml
index c1d60225c..b67c9ec6e 100644
--- a/config/resque_schedule.yml
+++ b/config/resque_schedule.yml
@@ -44,4 +44,35 @@ remove_outdated_items:
   cron: '0 3 * * *'
   class: 'RemoveOutdatedItemsJob'
   queue: low
-  description: 'Removes outdated mass builds, product buid lists and build lists'
\ No newline at end of file
+  description: 'Removes outdated mass builds, product buid lists and build lists'
+
+autostart_builds_daily:
+  cron: '0 4 * * *'
+  class: 'AutostartBuildsDailyJob'
+  queue: low
+  description: 'Starts automatic builds every 24 hours'
+
+autostart_builds_once_every_twelve_hours:
+  cron: '0 4,16 * * *'
+  class: 'AutostartBuildsOnceEveryTwelveHoursJob'
+  queue: low
+  description: 'Starts automatic builds every 12 hours'
+
+autostart_builds_daily:
+  cron: '0 4 * * *'
+  class: 'AutostartBuildsDailyJob'
+  queue: low
+  description: 'Starts automatic builds every 24 hours'
+
+autostart_builds_weekly:
+  cron: '0 4 * * 0'
+  class: 'AutostartBuildsWeeklyJob'
+  queue: low
+  description: 'Starts automatic builds every week'
+
+build_canceling_destroy:
+  every:
+    - '1h'
+  class: 'BuildLists::BuildCancelingDestroyJob'
+  queue: low
+  description: 'Remove build canceling build lists'
\ No newline at end of file
diff --git a/config/schedule.rb b/config/schedule.rb
deleted file mode 100644
index 395541d7c..000000000
--- a/config/schedule.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#every 1.day, at: '0:05 am' do
-#  runner 'Download.rotate_nginx_log'
-#end
-#
-#every 1.day, at: '0:10 am' do
-#  runner 'Download.parse_and_remove_nginx_log'
-#end
-
-every :day, at: '3:00 am' do
-  rake 'activity_feeds:clear', output: 'log/activity_feeds.log'
-end
-
-every :day, at: '2:30 am' do
-  rake 'sitemap:refresh', output: 'log/sitemap.log'
-end
-
-every 1.hour do
-  rake 'buildlist:clear:outdated_canceling', output: 'log/canceling_build_list_clear.log'
-end
-
-every :day, at: '4am' do
-  runner 'Product.autostart_iso_builds_once_a_12_hours',    output: 'log/autostart_iso_builds.log'
-  runner 'Product.autostart_iso_builds_once_a_day',         output: 'log/autostart_iso_builds.log'
-  runner 'Project.autostart_build_lists_once_a_12_hours',   output: 'log/autostart_build_lists.log'
-  runner 'Project.autostart_build_lists_once_a_day',        output: 'log/autostart_build_lists.log'
-end
-
-every :day, at: '4pm' do
-  runner 'Product.autostart_iso_builds_once_a_12_hours',  output: 'log/autostart_iso_builds.log'
-  runner 'Project.autostart_build_lists_once_a_12_hours', output: 'log/autostart_build_lists.log'
-end
-
-every :sunday, at: '4am' do
-  runner 'Product.autostart_iso_builds_once_a_week',  output: 'log/autostart_iso_builds.log'
-  runner 'Project.autostart_build_lists_once_a_week', output: 'log/autostart_build_lists.log'
-end
-
-every :day, at: '1am' do
-  runner 'Platform.autostart_metadata_regeneration("day")', output: 'log/autostart_platform_metadata_regeneration.log'
-end
-
-every :saturday, at: '2am' do
-  runner 'Platform.autostart_metadata_regeneration("week")', output: 'log/autostart_platform_metadata_regeneration.log'
-end
diff --git a/lib/ext/core/string.rb b/lib/ext/core/string.rb
deleted file mode 100644
index b8837a085..000000000
--- a/lib/ext/core/string.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'charlock_holmes/string'
-
-class String
-  def default_encoding!
-    default_encoding = Encoding.default_internal || Encoding::UTF_8
-    if ascii_only? # no need to encode if ascii
-      force_encoding(default_encoding)
-    else # should encode
-      options = {invalid: :replace, undef: :replace, replace: ''}
-      if encoding.name == 'UTF-8'
-        encode!(default_encoding, 'UTF-8', options)
-      elsif (detected = detect_encoding) && detected[:encoding]
-        force_encoding(detected[:encoding]).encode!(default_encoding, detected[:encoding], options)
-      end
-      scrub('')
-      raise unless valid_encoding? # check result
-    end
-    self
-  rescue
-    replace "--broken encoding: #{detect_encoding[:encoding] || 'unknown'}"
-  # ensure
-  #   return self
-  end
-
-  # same as reverse.truncate.reverse
-  def rtruncate(length, options = {})
-    chars = self.dup.mb_chars
-    return self if chars.length <= length
-    options[:omission] ||= "..."
-    options[:separator] ||= '/'
-
-    start = chars.length - length + options[:omission].mb_chars.length
-    stop = options[:separator] ? (chars.index(options[:separator].mb_chars, start) || start) : start
-    "#{options[:omission]}#{chars[stop..-1]}".to_s
-  end
-end
diff --git a/lib/tasks/activity_feeds.rake b/lib/tasks/activity_feeds.rake
deleted file mode 100644
index 7a091dde1..000000000
--- a/lib/tasks/activity_feeds.rake
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace :activity_feeds do
-  desc 'Remove outdated activity feeds'
-  task clear: :environment do
-    say "Removing outdated Activity Feed"
-    User.all.each do |user|
-      outdated = ActivityFeed.outdated
-      say "User #{user.uname} has #{outdated.count} outdated ActivityFeed."
-      user.activity_feeds.outdated.destroy_all if outdated.count > 0
-    end
-    say "Outdated activity feeds was successfully removed."
-  end
-end
diff --git a/lib/tasks/migrate_from_mount_to_symlink.rake b/lib/tasks/migrate_from_mount_to_symlink.rake
deleted file mode 100644
index 98de5a833..000000000
--- a/lib/tasks/migrate_from_mount_to_symlink.rake
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace :downloads do
-
-  desc "Migrate from mount to symlinks"
-  task migrate: :environment do
-    Platform.opened.each do |pl|
-      system("sudo mv #{pl.symlink_path}/*.lst #{pl.path}")
-      system("sudo umount #{pl.symlink_path}")
-      system("sudo rm -Rf #{pl.symlink_path}")
-
-      pl.symlink_directory
-    end
-  end
-
-end
diff --git a/lib/tasks/projects.rake b/lib/tasks/projects.rake
deleted file mode 100644
index 2ed671a6e..000000000
--- a/lib/tasks/projects.rake
+++ /dev/null
@@ -1,45 +0,0 @@
-namespace :project do
-
-  namespace :maintainer do
-    desc 'Set maintainer to owner (or to owners owner if owner is a group) to projects'
-    task set_to_owner: :environment do
-      projects = Project.all
-      count = projects.count
-      say "Setting maintainer to all projects (#{count})"
-      percent_per_batch = 100 * 1000 / count
-      i = 1
-
-      projects.find_in_batches do |batch|
-        ActiveRecord::Base.transaction do
-          batch.each do |proj|
-            maintainer_id = (proj.owner_type == 'User') ? proj.owner_id : proj.owner.owner_id
-            proj.maintainer_id = maintainer_id
-            proj.save
-          end
-        end
-        say "#{percent_per_batch * i}% done."
-        i += 1
-      end
-      say "100% done"
-    end
-  end
-  task maintainer: 'maintainer:set_to_owner'
-
-end
-
-namespace :projects do
-  desc 'Add projects from one platform repository to another'
-  task copy_to_repo: :environment do
-    source_platform = Platform.find_by! name: ENV['SRC_PLATFORM']
-    dest_platform   = Platform.find_by! name: ENV['DST_PLATFORM']
-    source_repo     = source_platform.repositories.find_by! name: ENV['SRC_REPO']
-    dest_repo       = dest_platform.repositories.find_by!   name: ENV['DST_REPO']
-
-    say "Add from repo '#{source_platform.name}/#{source_repo.name}' to repo '#{dest_platform.name}/#{dest_repo.name}'."
-    source_repo.projects.each do |pr|
-      say "project #{pr.name}"
-      dest_repo.projects << pr rescue print ' Add to repo failed!'
-    end
-    say 'DONE'
-  end
-end
\ No newline at end of file