features and widgets added

Conflicts:
	app/assets/javascripts/orbitdesktop.js

app/uploaders/image_uploader.rb

@@ -69,9 +69,9 @@ def cache_dir
 
   
   def manipulate!
-    cache_stored_file! if !cached?
+    # cache_stored_file! if !cached?
 #raise File.extname(current_path.to_s).to_s
-    image = ::MiniMagick::Image.open(current_path)
+    # image = ::MiniMagick::Image.open(current_path)
 #    image = yield(image)
 #    image.write(current_path)
 #    ::MiniMagick::Image.open(current_path)