Commit to pull, no major changes.
Committing to add target files.
deleted things
Added more offending files
More things added for the commit
Merge branch 'master' of https://github.com/ahrekar/Simplicity

Conflicts:
	devDb.h2.db
	devDb.lock.db
	target/classes/ApplicationResources.class
	target/classes/BootStrap.class
	target/classes/BuildConfig.class
	target/classes/Config.class
	target/classes/DataSource.class
	target/classes/UrlMappings.class
	target/classes/resources.class
	target/classes/simplicity/Assignment.class
	target/classes/simplicity/AssignmentController$_tt__delete_closure11_closure18.class
	target/classes/simplicity/AssignmentController$_tt__save_closure9_closure14.class
	target/classes/simplicity/AssignmentController$_tt__update_closure10_closure16.class
	target/classes/simplicity/AssignmentController.class
	target/classes/simplicity/Class.class
	target/classes/simplicity/ClassController$_tt__delete_closure11_closure18.class
	target/classes/simplicity/ClassController$_tt__delete_closure12_closure19.class
	target/classes/simplicity/ClassController$_tt__save_closure10_closure15.class
	target/classes/simplicity/ClassController$_tt__save_closure9_closure14.class
	target/classes/simplicity/ClassController$_tt__update_closure10_closure16.class
	target/classes/simplicity/ClassController$_tt__update_closure11_closure17.class
	target/classes/simplicity/ClassController.class
	target/classes/simplicity/HomeController.class
	target/classes/simplicity/Item.class
	target/classes/simplicity/Material.class
	target/classes/simplicity/MaterialController$_tt__delete_closure11_closure18.class
	target/classes/simplicity/MaterialController$_tt__save_closure9_closure14.class
	target/classes/simplicity/MaterialController$_tt__update_closure10_closure16.class
	target/classes/simplicity/MaterialController.class
	target/stacktrace.log
	target/work/plugin-build-classes/TomcatGrailsPlugin.class
	target/work/plugin-build-classes/org/grails/plugins/tomcat/InlineExplodedTomcatServer.class
	target/work/plugin-build-classes/org/grails/plugins/tomcat/TomcatLoader.class
	target/work/plugin-build-classes/org/grails/plugins/tomcat/TomcatServer.class
	target/work/plugin-build-classes/org/grails/plugins/tomcat/TomcatServerFactory.class
	target/work/plugin-build-classes/org/grails/plugins/tomcat/fork/ForkedTomcatServer.class
	target/work/plugin-build-classes/org/grails/plugins/tomcat/fork/TomcatDevelopmentRunner.class
	target/work/plugin-build-classes/org/grails/plugins/tomcat/fork/TomcatExecutionContext.class
	target/work/plugin-build-classes/org/grails/plugins/tomcat/fork/TomcatWarRunner.class
	target/work/plugin-classes/CacheGrailsPlugin.class
	target/work/plugin-classes/DatabaseMigrationGrailsPlugin.class
	target/work/plugin-classes/DbdocUrlMappings.class
	target/work/plugin-classes/DefaultCacheConfig.class
	target/work/plugin-classes/DefaultWebXmlConfig.class
	target/work/plugin-classes/HibernateGrailsPlugin.class
	target/work/plugin-classes/JQueryConfig.class
	target/work/plugin-classes/JQueryPluginResources.class
	target/work/plugin-classes/JQueryResourceTagLib.class
	target/work/plugin-classes/JQueryService.class
	target/work/plugin-classes/JQueryTagLib.class
	target/work/plugin-classes/JqueryGrailsPlugin.class
	target/work/plugin-classes/ResourcesBootStrap.class
	target/work/plugin-classes/ResourcesGrailsPlugin.class
	target/work/plugin-classes/ScaffoldingGrailsPlugin.class
	target/work/plugin-classes/TomcatGrailsPlugin.class
	target/work/plugin-classes/WebxmlGrailsPlugin.class
	target/work/plugin-classes/grails/plugin/cache/CacheTagLib.class
	target/work/plugin-classes/grails/plugin/cache/ConfigBuilder.class
	target/work/plugin-classes/grails/plugin/cache/ConfigLoader.class
	target/work/plugin-classes/grails/plugin/cache/GrailsCacheAdminService.class
	target/work/plugin-classes/grails/plugin/databasemigration/ChangelogXml2Groovy.class
	target/work/plugin-classes/grails/plugin/databasemigration/DbdocController.class
	target/work/plugin-classes/grails/plugin/databasemigration/DslBuilder.class
	target/work/plugin-classes/grails/plugin/databasemigration/GormColumn.class
	target/work/plugin-classes/grails/plugin/databasemigration/GormDatabase.class
	target/work/plugin-classes/grails/plugin/databasemigration/GormDatabaseSnapshotGenerator.class
	target/work/plugin-classes/grails/plugin/databasemigration/GormDatabaseTypeConverter.class
	target/work/plugin-classes/grails/plugin/databasemigration/GormDiff.class
	target/work/plugin-classes/grails/plugin/databasemigration/GrailsChange$1.class
	target/work/plugin-classes/grails/plugin/databasemigration/GrailsChange.class
	target/work/plugin-classes/grails/plugin/databasemigration/GrailsChangeLogParser.class
	target/work/plugin-classes/grails/plugin/databasemigration/GrailsClassLoaderResourceAccessor.class
	target/work/plugin-classes/grails/plugin/databasemigration/GrailsDiffStatusListener.class
	target/work/plugin-classes/grails/plugin/databasemigration/GrailsPrecondition$1.class
	target/work/plugin-classes/grails/plugin/databasemigration/GrailsPrecondition.class
	target/work/plugin-classes/grails/plugin/databasemigration/GroovyAwareStringChangeLogSerializer.class
	target/work/plugin-classes/grails/plugin/databasemigration/HibernateAwareTypeConverter.class
	target/work/plugin-classes/grails/plugin/databasemigration/MigrationRunner.class
	target/work/plugin-classes/grails/plugin/databasemigration/MigrationUtils.class
	target/work/plugin-classes/grails/plugin/databasemigration/MySQLCompatibleChangeLogSerializer.class
	target/work/plugin-classes/grails/plugin/databasemigration/MysqlAwareCreateTableGenerator.class
	target/work/plugin-classes/grails/plugin/databasemigration/NoopVisitor.class
	target/work/plugin-classes/grails/plugin/databasemigration/ScriptUtils.class
	target/work/plugin-classes/grails/plugin/databasemigration/Slf4jLogger.class
	target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/AuthorListWriter.class
	target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/AuthorWriter.class
	target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/ChangeLogListWriter.class
	target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/ChangeLogWriter.class
	target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/ColumnWriter.class
	target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/HTMLListWriter.class
	target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/HTMLWriter.class
	target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/MemoryDocVisitor.class
	target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/PendingChangesWriter.class
	target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/PendingSQLWriter.class
	target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/RecentChangesWriter.class
	target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/TableListWriter.class
	target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/TableWriter.class
	target/work/plugin-classes/grails/plugin/hibernate3/HibernatePluginSupport.class
	target/work/plugin-classes/grails/plugin/webxml/FilterManager.class
	target/work/plugin-classes/org/codehaus/groovy/grails/plugins/jquery/JQueryConfig.class
	target/work/plugin-classes/org/codehaus/groovy/grails/plugins/jquery/JQueryProvider.class
	target/work/plugin-classes/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGenerator.class
	target/work/plugin-classes/org/grails/plugin/resource/AggregatedResourceMeta.class
	target/work/plugin-classes/org/grails/plugin/resource/BaseUrlResourceMapper.class
	target/work/plugin-classes/org/grails/plugin/resource/BundleResourceMapper.class
	target/work/plugin-classes/org/grails/plugin/resource/CSSBundleResourceMeta.class
	target/work/plugin-classes/org/grails/plugin/resource/CSSLinkProcessor.class
	target/work/plugin-classes/org/grails/plugin/resource/CSSPreprocessorResourceMapper.class
	target/work/plugin-classes/org/grails/plugin/resource/CSSRewriterResourceMapper.class
	target/work/plugin-classes/org/grails/plugin/resource/DevModeSanityFilter.class
	target/work/plugin-classes/org/grails/plugin/resource/JavaScriptBundleResourceMeta.class
	target/work/plugin-classes/org/grails/plugin/resource/ProcessingFilter.class
	target/work/plugin-classes/org/grails/plugin/resource/ResourceMeta.class
	target/work/plugin-classes/org/grails/plugin/resource/ResourceModule.class
	target/work/plugin-classes/org/grails/plugin/resource/ResourceProcessor.class
	target/work/plugin-classes/org/grails/plugin/resource/ResourceProcessorBatch.class
	target/work/plugin-classes/org/grails/plugin/resource/ResourceTagLib.class
	target/work/plugin-classes/org/grails/plugin/resource/URLUtils.class
	target/work/plugin-classes/org/grails/plugin/resource/mapper/MapperPhase.class
	target/work/plugin-classes/org/grails/plugin/resource/mapper/ResourceMapper.class
	target/work/plugin-classes/org/grails/plugin/resource/mapper/ResourceMappersFactory.class
	target/work/plugin-classes/org/grails/plugin/resource/module/ModuleBuilder.class
	target/work/plugin-classes/org/grails/plugin/resource/module/ModuleDeclarationsFactory.class
	target/work/plugin-classes/org/grails/plugin/resource/module/ModulesBuilder.class
	target/work/plugin-classes/org/grails/plugin/resource/util/DispositionsUtils.class
	target/work/plugin-classes/org/grails/plugin/resource/util/HalfBakedLegacyLinkGenerator.class
	target/work/plugin-classes/org/grails/plugin/resource/util/ResourceMetaStore.class
	target/work/plugin-classes/org/grails/plugin/resource/util/StatsManager.class
	target/work/plugin-classes/org/grails/plugins/tomcat/InlineExplodedTomcatServer.class
	target/work/plugin-classes/org/grails/plugins/tomcat/TomcatLoader.class
	target/work/plugin-classes/org/grails/plugins/tomcat/TomcatServer.class
	target/work/plugin-classes/org/grails/plugins/tomcat/TomcatServerFactory.class
	target/work/plugin-classes/org/grails/plugins/tomcat/fork/ForkedTomcatServer.class
	target/work/plugin-classes/org/grails/plugins/tomcat/fork/TomcatDevelopmentRunner.class
	target/work/plugin-classes/org/grails/plugins/tomcat/fork/TomcatExecutionContext.class
	target/work/plugin-classes/org/grails/plugins/tomcat/fork/TomcatWarRunner.class
	target/work/plugins/database-migration-1.3.8/LICENSE.txt
	target/work/plugins/database-migration-1.3.8/grails-app/views/dbdoc/_globalnav.gsp
	target/work/plugins/database-migration-1.3.8/grails-app/views/dbdoc/_index.gsp
	target/work/plugins/database-migration-1.3.8/grails-app/views/dbdoc/_overview-summary.gsp
	target/work/plugins/database-migration-1.3.8/grails-app/views/dbdoc/_stylesheet.gsp
	target/work/plugins/database-migration-1.3.8/scripts/DbmChangelogSync.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmChangelogSyncSql.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmClearChecksums.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmCreateChangelog.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmDbDoc.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmDropAll.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmFutureRollbackSql.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmGenerateChangelog.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmGenerateGormChangelog.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmGormDiff.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmListLocks.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmListTags.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmMarkNextChangesetRan.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmPreviousChangesetSql.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmRegisterChangelog.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmReleaseLocks.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmRollback.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmRollbackCount.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmRollbackCountSql.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmRollbackSql.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmRollbackToDate.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmRollbackToDateSql.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmStatus.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmTag.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmUpdate.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmUpdateCount.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmUpdateCountSql.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmUpdateSql.groovy
	target/work/plugins/database-migration-1.3.8/scripts/DbmValidate.groovy
	target/work/plugins/database-migration-1.3.8/src/groovy/grails/plugin/databasemigration/dbdoc/AuthorListWriter.groovy
	target/work/plugins/database-migration-1.3.8/src/groovy/grails/plugin/databasemigration/dbdoc/AuthorWriter.groovy
	target/work/plugins/database-migration-1.3.8/src/groovy/grails/plugin/databasemigration/dbdoc/ChangeLogListWriter.groovy
	target/work/plugins/database-migration-1.3.8/src/groovy/grails/plugin/databasemigration/dbdoc/ChangeLogWriter.groovy
	target/work/plugins/database-migration-1.3.8/src/groovy/grails/plugin/databasemigration/dbdoc/ColumnWriter.groovy
	target/work/plugins/database-migration-1.3.8/src/groovy/grails/plugin/databasemigration/dbdoc/HTMLListWriter.groovy
	target/work/plugins/database-migration-1.3.8/src/groovy/grails/plugin/databasemigration/dbdoc/HTMLWriter.groovy
	target/work/plugins/database-migration-1.3.8/src/groovy/grails/plugin/databasemigration/dbdoc/PendingChangesWriter.groovy
	target/work/plugins/database-migration-1.3.8/src/groovy/grails/plugin/databasemigration/dbdoc/PendingSQLWriter.groovy
	target/work/plugins/database-migration-1.3.8/src/groovy/grails/plugin/databasemigration/dbdoc/RecentChangesWriter.groovy
	target/work/plugins/database-migration-1.3.8/src/groovy/grails/plugin/databasemigration/dbdoc/TableListWriter.groovy
	target/work/plugins/database-migration-1.3.8/src/groovy/grails/plugin/databasemigration/dbdoc/TableWriter.groovy
	target/work/plugins/webxml-1.4.1/LICENSE.txt
	target/work/plugins/webxml-1.4.1/grails-app/conf/DefaultWebXmlConfig.groovy
	target/work/plugins/webxml-1.4.1/src/samples/_WebXmlConfig.groovy
	target/work/scriptCache/GenerateController.class
	target/work/scriptCache/GenerateViews.class
	target/work/scriptCache/_GrailsArgParsing_groovy.class
	target/work/scriptCache/_GrailsBootstrap_groovy.class
	target/work/scriptCache/_GrailsClasspath_groovy.class
	target/work/scriptCache/_GrailsClean_groovy.class
	target/work/scriptCache/_GrailsCompile_groovy.class
	target/work/scriptCache/_GrailsCreateArtifacts_groovy.class
	target/work/scriptCache/_GrailsEvents_groovy.class
	target/work/scriptCache/_GrailsGenerate_groovy.class
	target/work/scriptCache/_GrailsInit_groovy.class
	target/work/scriptCache/_GrailsPackage_groovy.class
	target/work/scriptCache/_GrailsProxy_groovy.class
	target/work/scriptCache/_GrailsRun_groovy.class
	target/work/scriptCache/_GrailsSettings_groovy.class
	target/work/scriptCache/_GrailsWar_groovy.class
	target/work/scriptCache/_PackagePlugins_groovy.class
	target/work/scriptCache/_PluginDependencies_groovy.class
	target/work/tomcat/work/Tomcat/localhost/simplicity/grails-resources/css/index.css