#8 CRUD User V1
merge UserSpec
#6 Configure database
Merge branch 'master' of https://github.com/bakinibilel/comtrek.git

Conflicts:
	comtrek/grails-app/domain/comtrek/User.groovy
	comtrek/test/unit/comtrek/UserSpec.groovy
Merge branch 'master' of https://github.com/bakinibilel/comtrek.git

Conflicts:
	comtrek/.gitignore
	comtrek/target-eclipse/classes/BuildConfig$_run_closure1.class
	comtrek/target-eclipse/classes/BuildConfig$_run_closure1_closure4.class
	comtrek/target-eclipse/classes/BuildConfig$_run_closure1_closure5.class
	comtrek/target-eclipse/classes/DataSource$_run_closure1.class
	comtrek/target-eclipse/classes/DataSource$_run_closure2.class
	comtrek/target-eclipse/classes/DataSource$_run_closure3.class
	comtrek/target-eclipse/classes/DataSource$_run_closure3_closure4.class
	comtrek/target-eclipse/classes/DataSource$_run_closure3_closure4_closure7.class
	comtrek/target-eclipse/classes/DataSource$_run_closure3_closure5.class
	comtrek/target-eclipse/classes/DataSource$_run_closure3_closure6.class
	comtrek/target-eclipse/classes/DataSource.class
	comtrek/target-eclipse/classes/grails/plugin/databasemigration/DbdocController.class
	comtrek/target/classes/ApplicationResources.class
	comtrek/target/classes/BootStrap.class
	comtrek/target/classes/BuildConfig$_run_closure1.class
	comtrek/target/classes/BuildConfig$_run_closure1_closure4.class
	comtrek/target/classes/BuildConfig$_run_closure1_closure5.class
	comtrek/target/classes/BuildConfig.class
	comtrek/target/classes/Config.class
	comtrek/target/classes/DataSource$_run_closure1.class
	comtrek/target/classes/DataSource$_run_closure2.class
	comtrek/target/classes/DataSource$_run_closure3.class
	comtrek/target/classes/DataSource$_run_closure3_closure4.class
	comtrek/target/classes/DataSource$_run_closure3_closure4_closure7.class
	comtrek/target/classes/DataSource$_run_closure3_closure5.class
	comtrek/target/classes/DataSource$_run_closure3_closure6.class
	comtrek/target/classes/DataSource.class
	comtrek/target/classes/UrlMappings.class
	comtrek/target/classes/resources.class
	comtrek/target/stacktrace.log
	comtrek/test/unit/comtrek/UserSpec.groovy
Merge branch 'master' of https://github.com/bakinibilel/comtrek.git

Conflicts:
	comtrek/.gitignore
	comtrek/target-eclipse/classes/ApplicationResources.class
	comtrek/target-eclipse/classes/BuildConfig$_run_closure1.class
	comtrek/target-eclipse/classes/BuildConfig$_run_closure1_closure4.class
	comtrek/target-eclipse/classes/BuildConfig$_run_closure1_closure5.class
	comtrek/target-eclipse/classes/BuildConfig.class
	comtrek/target-eclipse/classes/Config.class
	comtrek/target-eclipse/classes/DataSource$_run_closure1.class
	comtrek/target-eclipse/classes/DataSource$_run_closure2.class
	comtrek/target-eclipse/classes/DataSource$_run_closure3.class
	comtrek/target-eclipse/classes/DataSource$_run_closure3_closure4.class
	comtrek/target-eclipse/classes/DataSource$_run_closure3_closure4_closure7.class
	comtrek/target-eclipse/classes/DataSource$_run_closure3_closure5.class
	comtrek/target-eclipse/classes/DataSource$_run_closure3_closure6.class
	comtrek/target-eclipse/classes/DataSource.class
	comtrek/target-eclipse/classes/DefaultCacheConfig.class
	comtrek/target-eclipse/classes/DefaultWebXmlConfig.class
	comtrek/target-eclipse/classes/JQueryConfig.class
	comtrek/target-eclipse/classes/JQueryPluginResources.class
	comtrek/target-eclipse/classes/JQueryResourceTagLib.class
	comtrek/target-eclipse/classes/JQueryTagLib.class
	comtrek/target-eclipse/classes/dbdoc/_globalnav.gsp
	comtrek/target-eclipse/classes/dbdoc/_index.gsp
	comtrek/target-eclipse/classes/dbdoc/_overview-summary.gsp
	comtrek/target-eclipse/classes/dbdoc/_stylesheet.gsp
	comtrek/target-eclipse/classes/grails/plugin/cache/BlockingCache.class
	comtrek/target-eclipse/classes/grails/plugin/cache/CacheBeanPostProcessor.class
	comtrek/target-eclipse/classes/grails/plugin/cache/CacheConfigArtefactHandler$CacheConfigGrailsClass.class
	comtrek/target-eclipse/classes/grails/plugin/cache/CacheConfigArtefactHandler$DefaultCacheConfigGrailsClass.class
	comtrek/target-eclipse/classes/grails/plugin/cache/CacheConfigArtefactHandler.class
	comtrek/target-eclipse/classes/grails/plugin/cache/CacheConfiguration.class
	comtrek/target-eclipse/classes/grails/plugin/cache/CacheEvict.class
	comtrek/target-eclipse/classes/grails/plugin/cache/CachePut.class
	comtrek/target-eclipse/classes/grails/plugin/cache/CacheTagLib.class
	comtrek/target-eclipse/classes/grails/plugin/cache/Cacheable.class
	comtrek/target-eclipse/classes/grails/plugin/cache/GrailsAnnotationCacheOperationSource$DefaultCacheKey.class
	comtrek/target-eclipse/classes/grails/plugin/cache/GrailsAnnotationCacheOperationSource.class
	comtrek/target-eclipse/classes/grails/plugin/cache/GrailsCache.class
	comtrek/target-eclipse/classes/grails/plugin/cache/GrailsCacheManager.class
	comtrek/target-eclipse/classes/grails/plugin/cache/GrailsConcurrentMapCache.class
	comtrek/target-eclipse/classes/grails/plugin/cache/GrailsConcurrentMapCacheManager.class
	comtrek/target-eclipse/classes/grails/plugin/cache/GrailsValueWrapper.class
	comtrek/target-eclipse/classes/grails/plugin/cache/SerializableByteArrayOutputStream.class
	comtrek/target-eclipse/classes/grails/plugin/cache/SerializableOutputStream.class
	comtrek/target-eclipse/classes/grails/plugin/cache/Timer.class
	comtrek/target-eclipse/classes/grails/plugin/cache/compiler/CacheTransformation.class
	comtrek/target-eclipse/classes/grails/plugin/cache/util/ClassUtils.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/AlreadyGzippedException.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/ContentCacheParameters.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/GenericResponseWrapper.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/Header$Type.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/Header.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/HttpDateFormatter.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/PageInfo.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/ProxyAwareMixedGrailsControllerHelper.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/SerializableCookie.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/filter/AbstractFilter.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/filter/CacheExpressionRootObject.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/filter/CacheOperationContext.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/filter/DefaultWebKeyGenerator.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/filter/ExpressionEvaluator.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/filter/FilterServletOutputStream.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/filter/LazyParamAwareEvaluationContext.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/filter/NoOpFilter.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/filter/PageFragmentCachingFilter$1.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/filter/PageFragmentCachingFilter$CacheStatus.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/filter/PageFragmentCachingFilter.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/filter/WebKeyGenerator.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/filter/simple/MemoryBlockingCache.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/filter/simple/MemoryCacheConfiguration.class
	comtrek/target-eclipse/classes/grails/plugin/cache/web/filter/simple/MemoryPageFragmentCachingFilter.class
	comtrek/target-eclipse/classes/grails/plugin/databasemigration/DbdocController.class
	comtrek/target-eclipse/classes/org/grails/plugin/resource/ResourceTagLib.class
	comtrek/target-eclipse/classes/org/grails/plugin/resources/artefacts/AbstractResourcesArtefactHandler.class
	comtrek/target-eclipse/classes/org/grails/plugin/resources/artefacts/DefaultResourceMapperClass.class
	comtrek/target-eclipse/classes/org/grails/plugin/resources/artefacts/DefaultResourcesClass.class
	comtrek/target-eclipse/classes/org/grails/plugin/resources/artefacts/ResourceMapperArtefactHandler.class
	comtrek/target-eclipse/classes/org/grails/plugin/resources/artefacts/ResourceMapperClass.class
	comtrek/target-eclipse/classes/org/grails/plugin/resources/artefacts/ResourcesArtefactHandler.class
	comtrek/target-eclipse/classes/org/grails/plugin/resources/artefacts/ResourcesClass.class
	comtrek/target-eclipse/classes/resources.class