Test
rickey's push
Merge https://github.com/brentatwork/imitationtwitter

Conflicts:
	Twitter-grailsPlugins.iml
	Twitter.iml
	target/classes/sftwitter/Test.class
	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/AssetPipelineBootStrap.class
	target/work/plugin-classes/AssetPipelineGrailsPlugin.class
	target/work/plugin-classes/AssetUrlMappings.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/Hibernate4GrailsPlugin.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/ScaffoldingGrailsPlugin.class
	target/work/plugin-classes/WebxmlGrailsPlugin.class
	target/work/plugin-classes/asset/pipeline/AbstractAssetFile.class
	target/work/plugin-classes/asset/pipeline/AbstractProcessor.class
	target/work/plugin-classes/asset/pipeline/AssetCompiler.class
	target/work/plugin-classes/asset/pipeline/AssetHelper.class
	target/work/plugin-classes/asset/pipeline/AssetMethodTagLib.class
	target/work/plugin-classes/asset/pipeline/AssetPipelineFilter.class
	target/work/plugin-classes/asset/pipeline/AssetProcessorService.class
	target/work/plugin-classes/asset/pipeline/AssetsController.class
	target/work/plugin-classes/asset/pipeline/AssetsTagLib.class
	target/work/plugin-classes/asset/pipeline/CacheManager.class
	target/work/plugin-classes/asset/pipeline/CssAssetFile.class
	target/work/plugin-classes/asset/pipeline/DirectiveProcessor.class
	target/work/plugin-classes/asset/pipeline/HtmlAssetFile.class
	target/work/plugin-classes/asset/pipeline/JsAssetFile.class
	target/work/plugin-classes/asset/pipeline/ManifestAssetFile.class
	target/work/plugin-classes/asset/pipeline/grails/AssetResourceLocator.class
	target/work/plugin-classes/asset/pipeline/grails/CachingLinkGenerator.class
	target/work/plugin-classes/asset/pipeline/grails/LinkGenerator.class
	target/work/plugin-classes/asset/pipeline/processors/CssMinifyPostProcessor.class
	target/work/plugin-classes/asset/pipeline/processors/CssProcessor.class
	target/work/plugin-classes/asset/pipeline/processors/UglifyJsProcessor.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/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

Rickey's push