Viejo desde office
Merge branch 'master' of https://github.com/qtagtech/nest5Knowledge

Conflicts:
	.idea/workspace.xml
	target/classes/nest5knowledge/Answer$__clinit__closure1.class
	target/classes/nest5knowledge/Answer$__clinit__closure2.class
	target/classes/nest5knowledge/Answer.class
	target/classes/nest5knowledge/Article$__clinit__closure1.class
	target/classes/nest5knowledge/Article$__clinit__closure2.class
	target/classes/nest5knowledge/Article.class
	target/classes/nest5knowledge/ArticleTag.class
	target/classes/nest5knowledge/Category.class
	target/classes/nest5knowledge/Comment.class
	target/classes/nest5knowledge/Question$__clinit__closure1.class
	target/classes/nest5knowledge/Question$__clinit__closure2.class
	target/classes/nest5knowledge/Question.class
	target/classes/nest5knowledge/QuestionTag.class
	target/classes/nest5knowledge/Tag.class
	target/classes/nest5knowledge/Type.class