Solucion al problema de los merge
Version estable con la funcion de todas las ramas
Merge branch 'master' of https://github.com/virttuall/UNFlea-

Conflicts:
	UNFleaPlus/.DS_Store
	UNFleaPlus/.classpath
	UNFleaPlus/.project
	UNFleaPlus/.settings/org.eclipse.core.resources.prefs
	UNFleaPlus/application.properties
	UNFleaPlus/grails-app/.DS_Store
	UNFleaPlus/grails-app/assets/.DS_Store
	UNFleaPlus/grails-app/assets/fonts/.DS_Store
	UNFleaPlus/grails-app/assets/fonts/glyphicons-halflings-regular.eot
	UNFleaPlus/grails-app/assets/fonts/glyphicons-halflings-regular.svg
	UNFleaPlus/grails-app/assets/fonts/glyphicons-halflings-regular.ttf
	UNFleaPlus/grails-app/assets/fonts/glyphicons-halflings-regular.woff
	UNFleaPlus/grails-app/assets/images/.DS_Store
	UNFleaPlus/grails-app/assets/images/AndresGutierrez.png
	UNFleaPlus/grails-app/assets/images/MateoNieto.png
	UNFleaPlus/grails-app/assets/images/REARU.png
	UNFleaPlus/grails-app/assets/images/SamuelCabezas.png
	UNFleaPlus/grails-app/assets/images/USA.png
	UNFleaPlus/grails-app/assets/images/arrow-next.png
	UNFleaPlus/grails-app/assets/images/arrow-prev.png
	UNFleaPlus/grails-app/assets/images/espana.png
	UNFleaPlus/grails-app/assets/images/home.png
	UNFleaPlus/grails-app/assets/images/user.png
	UNFleaPlus/grails-app/assets/javascripts/.DS_Store
	UNFleaPlus/grails-app/assets/javascripts/application.js
	UNFleaPlus/grails-app/assets/javascripts/bootstrap.js
	UNFleaPlus/grails-app/assets/javascripts/bootstrap.min.js
	UNFleaPlus/grails-app/assets/javascripts/home.js
	UNFleaPlus/grails-app/assets/javascripts/modal.js
	UNFleaPlus/grails-app/assets/javascripts/register.js
	UNFleaPlus/grails-app/assets/stylesheets/.DS_Store
	UNFleaPlus/grails-app/assets/stylesheets/about.css
	UNFleaPlus/grails-app/assets/stylesheets/application.css
	UNFleaPlus/grails-app/assets/stylesheets/bootstrap-theme.css
	UNFleaPlus/grails-app/assets/stylesheets/bootstrap-theme.css.map
	UNFleaPlus/grails-app/assets/stylesheets/bootstrap-theme.min.css
	UNFleaPlus/grails-app/assets/stylesheets/bootstrap.css
	UNFleaPlus/grails-app/assets/stylesheets/bootstrap.css.map
	UNFleaPlus/grails-app/assets/stylesheets/bootstrap.min.css
	UNFleaPlus/grails-app/assets/stylesheets/contact.css
	UNFleaPlus/grails-app/assets/stylesheets/errors.css
	UNFleaPlus/grails-app/assets/stylesheets/home.css
	UNFleaPlus/grails-app/assets/stylesheets/init.css
	UNFleaPlus/grails-app/assets/stylesheets/login.css
	UNFleaPlus/grails-app/assets/stylesheets/main.css
	UNFleaPlus/grails-app/assets/stylesheets/mobile.css
	UNFleaPlus/grails-app/assets/stylesheets/register.css
	UNFleaPlus/grails-app/conf/BootStrap.groovy
	UNFleaPlus/grails-app/conf/BuildConfig.groovy
	UNFleaPlus/grails-app/conf/Config.groovy
	UNFleaPlus/grails-app/conf/DataSource.groovy
	UNFleaPlus/grails-app/conf/UrlMappings.groovy
	UNFleaPlus/grails-app/conf/spring/resources.groovy
	UNFleaPlus/grails-app/conf/unfleaplus/SecurityFilters.groovy
	UNFleaPlus/grails-app/controllers/unfleaplus/AuthController.groovy
	UNFleaPlus/grails-app/controllers/unfleaplus/IndexController.groovy
	UNFleaPlus/grails-app/controllers/unfleaplus/UserController.groovy
	UNFleaPlus/grails-app/domain/unfleaplus/Role.groovy
	UNFleaPlus/grails-app/domain/unfleaplus/User.groovy
	UNFleaPlus/grails-app/i18n/messages.properties
	UNFleaPlus/grails-app/i18n/messages_cs_CZ.properties
	UNFleaPlus/grails-app/i18n/messages_da.properties
	UNFleaPlus/grails-app/i18n/messages_de.properties
	UNFleaPlus/grails-app/i18n/messages_en.properties
	UNFleaPlus/grails-app/i18n/messages_es.properties
	UNFleaPlus/grails-app/i18n/messages_fr.properties
	UNFleaPlus/grails-app/i18n/messages_it.properties
	UNFleaPlus/grails-app/i18n/messages_ja.properties
	UNFleaPlus/grails-app/i18n/messages_nb.properties
	UNFleaPlus/grails-app/i18n/messages_nl.properties
	UNFleaPlus/grails-app/i18n/messages_pl.properties
	UNFleaPlus/grails-app/i18n/messages_pt_BR.properties
	UNFleaPlus/grails-app/i18n/messages_pt_PT.properties
	UNFleaPlus/grails-app/i18n/messages_ru.properties
	UNFleaPlus/grails-app/i18n/messages_sv.properties
	UNFleaPlus/grails-app/i18n/messages_th.properties
	UNFleaPlus/grails-app/i18n/messages_zh_CN.properties
	UNFleaPlus/grails-app/i18n/shiro.properties
	UNFleaPlus/grails-app/realms/unfleaplus/DbRealm.groovy
	UNFleaPlus/grails-app/views/error.gsp
	UNFleaPlus/grails-app/views/index/aboutUs.gsp
	UNFleaPlus/grails-app/views/index/contactUs.gsp
	UNFleaPlus/grails-app/views/index/index.gsp
	UNFleaPlus/grails-app/views/layouts/main.gsp
	UNFleaPlus/grails-app/views/user/home.gsp
	UNFleaPlus/grails-app/views/user/login.gsp
	UNFleaPlus/grails-app/views/user/register.gsp
	UNFleaPlus/target/classes/BootStrap$_closure1.class
	UNFleaPlus/target/classes/BootStrap$_closure2.class
	UNFleaPlus/target/classes/BootStrap.class
	UNFleaPlus/target/classes/BuildConfig.class
	UNFleaPlus/target/classes/Config.class
	UNFleaPlus/target/classes/DataSource.class
	UNFleaPlus/target/classes/UrlMappings$__clinit__closure1.class
	UNFleaPlus/target/classes/UrlMappings.class
	UNFleaPlus/target/classes/application.properties
	UNFleaPlus/target/classes/resources.class
	UNFleaPlus/target/classes/unfleaplus/AuthController.class
	UNFleaPlus/target/classes/unfleaplus/DbRealm.class
	UNFleaPlus/target/classes/unfleaplus/IndexController.class
	UNFleaPlus/target/classes/unfleaplus/Role.class
	UNFleaPlus/target/classes/unfleaplus/SecurityFilters.class
	UNFleaPlus/target/classes/unfleaplus/User.class
	UNFleaPlus/target/classes/unfleaplus/UserController.class
	UNFleaPlus/target/work/plugin-build-classes/TomcatGrailsPlugin.class
	UNFleaPlus/target/work/plugin-build-classes/org/grails/plugins/tomcat/InlineExplodedTomcatServer.class
	UNFleaPlus/target/work/plugin-build-classes/org/grails/plugins/tomcat/TomcatKillSwitch.class
	UNFleaPlus/target/work/plugin-build-classes/org/grails/plugins/tomcat/TomcatLoader.class
	UNFleaPlus/target/work/plugin-build-classes/org/grails/plugins/tomcat/TomcatServer.class
	UNFleaPlus/target/work/plugin-build-classes/org/grails/plugins/tomcat/TomcatServerFactory.class
	UNFleaPlus/target/work/plugin-build-classes/org/grails/plugins/tomcat/fork/ForkedTomcatServer.class
	UNFleaPlus/target/work/plugin-build-classes/org/grails/plugins/tomcat/fork/TomcatDevelopmentRunner.class
	UNFleaPlus/target/work/plugin-build-classes/org/grails/plugins/tomcat/fork/TomcatExecutionContext.class
	UNFleaPlus/target/work/plugin-build-classes/org/grails/plugins/tomcat/fork/TomcatWarRunner.class
	UNFleaPlus/target/work/plugin-classes/AssetPipelineBootStrap.class
	UNFleaPlus/target/work/plugin-classes/AssetPipelineGrailsPlugin.class
	UNFleaPlus/target/work/plugin-classes/AssetUrlMappings.class
	UNFleaPlus/target/work/plugin-classes/CacheGrailsPlugin.class
	UNFleaPlus/target/work/plugin-classes/DatabaseMigrationGrailsPlugin.class
	UNFleaPlus/target/work/plugin-classes/DbdocUrlMappings.class
	UNFleaPlus/target/work/plugin-classes/DefaultCacheConfig.class
	UNFleaPlus/target/work/plugin-classes/DefaultWebXmlConfig.class
	UNFleaPlus/target/work/plugin-classes/Hibernate4GrailsPlugin.class
	UNFleaPlus/target/work/plugin-classes/JQueryConfig.class
	UNFleaPlus/target/work/plugin-classes/JQueryPluginResources.class
	UNFleaPlus/target/work/plugin-classes/JQueryResourceTagLib.class
	UNFleaPlus/target/work/plugin-classes/JQueryService.class
	UNFleaPlus/target/work/plugin-classes/JQueryTagLib.class
	UNFleaPlus/target/work/plugin-classes/JqueryGrailsPlugin.class
	UNFleaPlus/target/work/plugin-classes/ScaffoldingGrailsPlugin.class
	UNFleaPlus/target/work/plugin-classes/ShiroGrailsPlugin.class
	UNFleaPlus/target/work/plugin-classes/WebxmlGrailsPlugin.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/AbstractAssetFile.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/AbstractProcessor.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/AssetCompiler.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/AssetHelper.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/AssetMethodTagLib.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/AssetPipelineFilter.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/AssetProcessorService.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/AssetsController.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/AssetsTagLib.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/CacheManager.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/CssAssetFile.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/DirectiveProcessor.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/HtmlAssetFile.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/JsAssetFile.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/ManifestAssetFile.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/grails/AssetResourceLocator.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/grails/CachingLinkGenerator.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/grails/LinkGenerator.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/processors/CssMinifyPostProcessor.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/processors/CssProcessor.class
	UNFleaPlus/target/work/plugin-classes/asset/pipeline/processors/UglifyJsProcessor.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/cache/CacheBeanPostProcessor.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/cache/CacheTagLib.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/cache/ConfigBuilder.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/cache/ConfigLoader.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/cache/GrailsCacheAdminService.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/cache/web/filter/simple/MemoryPageFragmentCachingFilter.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/ChangelogXml2Groovy.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/DbdocController.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/DslBuilder.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/GormColumn.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/GormDatabase.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/GormDatabaseSnapshotGenerator.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/GormDatabaseTypeConverter.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/GormDiff.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/GrailsChange$1.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/GrailsChange.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/GrailsChangeLogParser.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/GrailsClassLoaderResourceAccessor.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/GrailsDiffStatusListener.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/GrailsPrecondition$1.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/GrailsPrecondition.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/GroovyAwareStringChangeLogSerializer.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/HibernateAwareTypeConverter.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/MigrationRunner.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/MigrationUtils.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/MySQLCompatibleChangeLogSerializer.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/MysqlAwareCreateTableGenerator.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/NoopVisitor.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/ScriptUtils.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/Slf4jLogger.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/AuthorListWriter.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/AuthorWriter.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/ChangeLogListWriter.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/ChangeLogWriter.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/ColumnWriter.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/HTMLListWriter.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/HTMLWriter.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/MemoryDocVisitor.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/PendingChangesWriter.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/PendingSQLWriter.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/RecentChangesWriter.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/TableListWriter.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/TableWriter.class
	UNFleaPlus/target/work/plugin-classes/grails/plugin/webxml/FilterManager.class
	UNFleaPlus/target/work/plugin-classes/org/apache/shiro/authc/credential/PasswordHashAdapter.class
	UNFleaPlus/target/work/plugin-classes/org/apache/shiro/grails/AccessControlBuilder.class
	UNFleaPlus/target/work/plugin-classes/org/apache/shiro/grails/FilterAccessControlBuilder.class
	UNFleaPlus/target/work/plugin-classes/org/apache/shiro/grails/RealmWrapper.class
	UNFleaPlus/target/work/plugin-classes/org/apache/shiro/grails/ShiroAnnotationHandlerService.class
	UNFleaPlus/target/work/plugin-classes/org/apache/shiro/grails/ShiroFilters.class
	UNFleaPlus/target/work/plugin-classes/org/apache/shiro/grails/ShiroSecurityService.class
	UNFleaPlus/target/work/plugin-classes/org/apache/shiro/grails/ShiroTagLib.class
	UNFleaPlus/target/work/plugin-classes/org/codehaus/groovy/grails/plugins/jquery/JQueryConfig.class
	UNFleaPlus/target/work/plugin-classes/org/codehaus/groovy/grails/plugins/jquery/JQueryProvider.class
	UNFleaPlus/target/work/plugin-classes/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGenerator.class
	UNFleaPlus/target/work/resources/grails-app/i18n/messages.properties
	UNFleaPlus/target/work/resources/grails-app/i18n/messages_en.properties
	UNFleaPlus/target/work/resources/grails-app/i18n/messages_es.properties
	UNFleaPlus/target/work/scriptCache/ShiroQuickStart.class
	UNFleaPlus/target/work/scriptCache/_ShiroInternal_groovy.class
	UNFleaPlus/target/work/web.xml.tmp