xiaochuan yi dec 9 2013
dealing with git pull origin master abort
Merge branch 'master' of https://github.com/voyiger/racetrack

Conflicts:
	target-eclipse/classes/JQueryResourceTagLib.class
	target-eclipse/classes/JQueryTagLib.class
	target-eclipse/classes/grails/plugin/cache/BlockingCache.class
	target-eclipse/classes/grails/plugin/cache/CacheBeanPostProcessor.class
	target-eclipse/classes/grails/plugin/cache/CacheConfigArtefactHandler$CacheConfigGrailsClass.class
	target-eclipse/classes/grails/plugin/cache/CacheConfigArtefactHandler$DefaultCacheConfigGrailsClass.class
	target-eclipse/classes/grails/plugin/cache/CacheConfigArtefactHandler.class
	target-eclipse/classes/grails/plugin/cache/CacheConfiguration.class
	target-eclipse/classes/grails/plugin/cache/CacheEvict.class
	target-eclipse/classes/grails/plugin/cache/CachePut.class
	target-eclipse/classes/grails/plugin/cache/CacheTagLib.class
	target-eclipse/classes/grails/plugin/cache/Cacheable.class
	target-eclipse/classes/grails/plugin/cache/GrailsAnnotationCacheOperationSource$DefaultCacheKey.class
	target-eclipse/classes/grails/plugin/cache/GrailsAnnotationCacheOperationSource.class
	target-eclipse/classes/grails/plugin/cache/GrailsCache.class
	target-eclipse/classes/grails/plugin/cache/GrailsCacheManager.class
	target-eclipse/classes/grails/plugin/cache/GrailsConcurrentMapCache.class
	target-eclipse/classes/grails/plugin/cache/GrailsConcurrentMapCacheManager.class
	target-eclipse/classes/grails/plugin/cache/GrailsValueWrapper.class
	target-eclipse/classes/grails/plugin/cache/SerializableByteArrayOutputStream.class
	target-eclipse/classes/grails/plugin/cache/SerializableOutputStream.class
	target-eclipse/classes/grails/plugin/cache/Timer.class
	target-eclipse/classes/grails/plugin/cache/compiler/CacheTransformation.class
	target-eclipse/classes/grails/plugin/cache/util/ClassUtils.class
	target-eclipse/classes/grails/plugin/cache/web/AlreadyGzippedException.class
	target-eclipse/classes/grails/plugin/cache/web/ContentCacheParameters.class
	target-eclipse/classes/grails/plugin/cache/web/GenericResponseWrapper.class
	target-eclipse/classes/grails/plugin/cache/web/Header$Type.class
	target-eclipse/classes/grails/plugin/cache/web/Header.class
	target-eclipse/classes/grails/plugin/cache/web/HttpDateFormatter.class
	target-eclipse/classes/grails/plugin/cache/web/PageInfo.class
	target-eclipse/classes/grails/plugin/cache/web/ProxyAwareMixedGrailsControllerHelper.class
	target-eclipse/classes/grails/plugin/cache/web/SerializableCookie.class
	target-eclipse/classes/grails/plugin/cache/web/filter/AbstractFilter.class
	target-eclipse/classes/grails/plugin/cache/web/filter/CacheExpressionRootObject.class
	target-eclipse/classes/grails/plugin/cache/web/filter/CacheOperationContext.class
	target-eclipse/classes/grails/plugin/cache/web/filter/DefaultWebKeyGenerator.class
	target-eclipse/classes/grails/plugin/cache/web/filter/ExpressionEvaluator.class
	target-eclipse/classes/grails/plugin/cache/web/filter/FilterServletOutputStream.class
	target-eclipse/classes/grails/plugin/cache/web/filter/LazyParamAwareEvaluationContext.class
	target-eclipse/classes/grails/plugin/cache/web/filter/NoOpFilter.class
	target-eclipse/classes/grails/plugin/cache/web/filter/PageFragmentCachingFilter$1.class
	target-eclipse/classes/grails/plugin/cache/web/filter/PageFragmentCachingFilter$CacheStatus.class
	target-eclipse/classes/grails/plugin/cache/web/filter/PageFragmentCachingFilter.class
	target-eclipse/classes/grails/plugin/cache/web/filter/WebKeyGenerator.class
	target-eclipse/classes/grails/plugin/cache/web/filter/simple/MemoryBlockingCache.class
	target-eclipse/classes/grails/plugin/cache/web/filter/simple/MemoryCacheConfiguration.class
	target-eclipse/classes/grails/plugin/cache/web/filter/simple/MemoryPageFragmentCachingFilter.class
	target-eclipse/classes/grails/plugin/databasemigration/DbdocController.class
	target-eclipse/classes/grails/plugin/databasemigration/GroovyAwareStringChangeLogSerializer.class
	target-eclipse/classes/grails/plugin/databasemigration/MySQLCompatibleChangeLogSerializer.class
	target-eclipse/classes/grails/plugin/databasemigration/dbdoc/MemoryDocVisitor.class
	target-eclipse/classes/org/grails/plugin/resource/ResourceTagLib.class
	target-eclipse/classes/org/grails/plugin/resources/artefacts/AbstractResourcesArtefactHandler.class
	target-eclipse/classes/org/grails/plugin/resources/artefacts/DefaultResourceMapperClass.class
	target-eclipse/classes/org/grails/plugin/resources/artefacts/DefaultResourcesClass.class
	target-eclipse/classes/org/grails/plugin/resources/artefacts/ResourceMapperArtefactHandler.class
	target-eclipse/classes/org/grails/plugin/resources/artefacts/ResourceMapperClass.class
	target-eclipse/classes/org/grails/plugin/resources/artefacts/ResourcesArtefactHandler.class
	target-eclipse/classes/org/grails/plugin/resources/artefacts/ResourcesClass.class
	target-eclipse/classes/racetrack/FooterTagLib.class
	target-eclipse/classes/racetrack/FooterTagLibTests.class
	target-eclipse/classes/racetrack/Race.class
	target-eclipse/classes/racetrack/RaceController.class
	target-eclipse/classes/racetrack/RaceControllerTests.class
	target-eclipse/classes/racetrack/RaceTests.class
	target-eclipse/classes/racetrack/Registration.class
	target-eclipse/classes/racetrack/RegistrationTests.class
	target-eclipse/classes/racetrack/User.class
	target-eclipse/classes/racetrack/UserController$_closure2.class
	target-eclipse/classes/racetrack/UserController.class
	target-eclipse/classes/racetrack/UserControllerTests.class
	target-eclipse/classes/racetrack/UserTests.class
xiaochuan yi dec 9 2013, finish chapter 9