fix for grails
	deleted:    .classpath
	deleted:    .project
	modified:   Cornfluence-grailsPlugins.iml
	modified:   Cornfluence.iml
	modified:   application.properties
	modified:   grails-app/conf/Config.groovy
	modified:   grails-app/views/about.gsp
	modified:   grails-app/views/contact.gsp
	modified:   grails-app/views/index.gsp
	modified:   grails-app/views/people.gsp
	modified:   web-app/css/bootstrap.css
	modified:   web-app/css/customized.css
	modified:   web-app/images/rossnew.jpg
	new file:   web-app/js/bootstrap.js
renovation
updates
page updates
update grails, update views
	modified:   .idea/compiler.xml
	modified:   Cornfluence-grailsPlugins.iml
	modified:   Cornfluence.iml
	modified:   application.properties
	modified:   grails-app/conf/BootStrap.groovy
	modified:   grails-app/conf/BuildConfig.groovy
	modified:   grails-app/conf/Config.groovy
	modified:   grails-app/controllers/ContactController.groovy
	renamed:    grails-app/controllers/MainController.groovy -> grails-app/controllers/CornfluenceController.groovy
	modified:   grails-app/views/about.gsp
	modified:   grails-app/views/index.gsp
	modified:   grails-app/views/layouts/_packages.gsp
	modified:   grails-app/views/layouts/main.gsp
	deleted:    grails-app/views/master/_form.gsp
	deleted:    grails-app/views/master/create.gsp
	deleted:    grails-app/views/master/edit.gsp
	deleted:    grails-app/views/master/list.gsp
	deleted:    grails-app/views/master/show.gsp
	deleted:    grails-app/views/person/_form.gsp
	deleted:    grails-app/views/person/create.gsp
	deleted:    grails-app/views/person/edit.gsp
	deleted:    grails-app/views/person/list.gsp
	deleted:    grails-app/views/person/show.gsp
	deleted:    grails-app/views/user/_form.gsp
	deleted:    grails-app/views/user/create.gsp
	deleted:    grails-app/views/user/edit.gsp
	deleted:    grails-app/views/user/list.gsp
	deleted:    grails-app/views/user/show.gsp
	modified:   web-app/css/customized.css
	deleted:    web-app/css/errors.css
	deleted:    web-app/css/main.css
	deleted:    web-app/css/mobile.css
	deleted:    web-app/images/skin/database_add.png
	deleted:    web-app/images/skin/database_delete.png
	deleted:    web-app/images/skin/database_edit.png
	deleted:    web-app/images/skin/database_save.png
	deleted:    web-app/images/skin/database_table.png
	deleted:    web-app/images/skin/exclamation.png
	deleted:    web-app/images/skin/house.png
	deleted:    web-app/images/skin/information.png
	deleted:    web-app/images/skin/shadow.jpg
	deleted:    web-app/images/skin/sorted_asc.gif
	deleted:    web-app/images/skin/sorted_desc.gif
	new file:   web-app/js/backbone/backbone.js
	new file:   web-app/js/backbone/router.js
	new file:   web-app/js/backbone/underscore.js
	new file:   web-app/js/bootstrap-image-gallery.min.js
	modified:   web-app/js/bootstrap.js
	deleted:    web-app/js/bootstrap.min.js
	new file:   web-app/js/builder.js
	new file:   web-app/js/controls.js
	new file:   web-app/js/dragdrop.js
	new file:   web-app/js/effects.js
	new file:   web-app/js/jquery-1.7.1.js
	deleted:    web-app/js/jquery.js
	new file:   web-app/js/jquery/jquery-1.7.1.min.js
	new file:   web-app/js/jquery/jquery-1.7.min.js
	new file:   web-app/js/jquery/jquery.blockUI-2.39.js
	new file:   web-app/js/prototype.js
	new file:   web-app/js/scriptaculous.js
	new file:   web-app/js/slider.js
	new file:   web-app/js/sound.js
	new file:   web-app/js/spacegallery/eye.js
	new file:   web-app/js/spacegallery/spacegallery.js
	new file:   web-app/js/spacegallery/utils.js
	new file:   web-app/js/unittest.js
	modified:   .gitignore
	deleted:    Cornfluence-grailsPlugins.iml
	deleted:    Cornfluence.iml
	new file:   README.md
	deleted:    grails-app/conf/DataSource.groovy
	modified:   README.md
	deleted:    Cornfluence
Merge github.com:CharlesAHunt/dellabetta

Conflicts:
	.gitignore
	README.md