antes de pull
Merge branch 'master' of https://github.com/qtagtech/nest5Knowledge

Conflicts:
	.idea/workspace.xml
	target/classes/ApplicationResources.class
	target/classes/BootStrap.class
	target/classes/BuildConfig.class
	target/classes/Config.class

target/classes/DataSource$_run_closure1_closure4_closure8_closure9.class
	target/classes/DataSource.class
	target/classes/UrlMappings.class
	target/classes/application.properties
	target/classes/nest5knowledge/Admin.class
	target/classes/nest5knowledge/Answer.class
	target/classes/nest5knowledge/AnswerController.class
	target/classes/nest5knowledge/Article.class
	target/classes/nest5knowledge/ArticleController.class
	target/classes/nest5knowledge/ArticleTag.class
	target/classes/nest5knowledge/Category.class
	target/classes/nest5knowledge/CategoryController.class
	target/classes/nest5knowledge/Comment.class
	target/classes/nest5knowledge/CommentController.class
	target/classes/nest5knowledge/Question.class
	target/classes/nest5knowledge/QuestionController.class
	target/classes/nest5knowledge/QuestionTag.class
	target/classes/nest5knowledge/SecRole.class
	target/classes/nest5knowledge/SecUser.class
	target/classes/nest5knowledge/SecUserSecRole.class
	target/classes/nest5knowledge/Tag.class
	target/classes/nest5knowledge/TagController.class
	target/classes/nest5knowledge/Type.class
	target/classes/nest5knowledge/TypeController.class
	target/classes/resources.class