features and widgets added

Conflicts:
	app/assets/javascripts/orbitdesktop.js

app/models/desktop/desktop_widget.rb

@@ -6,6 +6,7 @@ class DesktopWidget
   	field :name
   	field :author
   	field :shape
+    field :fullsize, :type => Boolean
   	field :version, :type => String
 
   has_one :css_default, as: :css, :autosave => true, :dependent => :destroy
@@ -13,7 +14,7 @@ class DesktopWidget
 	has_many :images, as: :imgs, :autosave => true, :dependent => :destroy
 	has_many :javascripts, as: :js, :autosave => true, :dependent => :destroy
   has_and_belongs_to_many :desktops, :autosave => true
-  belongs_to :tiles, :autosave => true
+  has_many :tiles, :autosave => true
 	
 	accepts_nested_attributes_for :images, :allow_destroy => true
   accepts_nested_attributes_for :javascripts, :allow_destroy => true

app/models/desktop/tile.rb

@@ -6,9 +6,10 @@ class Tile
   field :data_content
   field :position, type: Integer
   field :shape
+  field :fullsize, type: Boolean
   field :title
   
   belongs_to :group
-  has_one :desktop_widget
+  belongs_to :desktop_widget
     
 end