Merge branch 'master' into new-gui

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/tracks.css.scss
	app/views/layouts/application.html.erb

Gemfile

@@ -55,6 +55,7 @@ group :development do
   gem 'tolk', '>=1.5.0'
   gem "bullet"
   gem "rack-mini-profiler"
+  gem "rack-dev-mark"
 end
 
 group :test do

Gemfile.lock

@@ -120,6 +120,8 @@ GEM
       nokogiri
     polyglot (0.3.5)
     rack (1.5.2)
+    rack-dev-mark (0.4.5)
+      rack (>= 1.1)
     rack-mini-profiler (0.9.2)
       rack (>= 1.1.3)
     rack-test (0.6.2)
@@ -238,6 +240,7 @@ DEPENDENCIES
   mocha
   mousetrap-rails
   mysql2
+  rack-dev-mark
   rack-mini-profiler
   rails (~> 4.1.0)
   rails_autolink

config/environments/development.rb

@@ -26,6 +26,6 @@ Rails.application.configure do
   # config.action_controller.session_store :cookie_store, :key => 'TracksCucumber'
   # config.action_controller.session = { :key => 'TracksDev' }
   
-  NOTIFY_BAR="<div id=\"develop-notify-bar\">&nbsp;</div>"
+  config.rack_dev_mark.enable = true
 
 end