upload images
Merge branch 'Package_Explorer' of http://github.com/ndomar/megasoft-13 into C1S21_UploadImages

Conflicts:
	Rails/WebsitesPrototypeBuilder/app/models/project.rb
	Rails/WebsitesPrototypeBuilder/config/routes.rb
	Rails/WebsitesPrototypeBuilder/test/fixtures/pages.yml
	Rails/WebsitesPrototypeBuilder/test/functional/home_controller_test.rb
done
updated to master
Removed tmp files
Folding side bar
Fold working
HTML5 Drag and drop
send xhr request
almost there
Added Color Palette
Added sharp egde styling
update to master
GUI games
missing controller
working
story done
story done
creating media
Merge branch 'C1S21_NewUploadImage' of http://github.com/ndomar/megasoft-13 into C1S21_NewUploadImage