Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry

Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb

Gemfile

@@ -27,9 +27,12 @@ gem 'resque-restriction'
 gem 'ruby-debug19'
 gem 'rubyzip'
 gem 'sinatra'
+#gem 'sinatra-contrib'
 gem 'sprockets'
 gem 'tinymce-rails'
 gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
+gem 'mongoid-encryptor', :require => 'mongoid/encryptor'
+#gem 'contacts'
 
 gem "impressionist", :require => "impressionist", :path => "vendor/impressionist"