merge
Merge branch 'master' of https://github.com/Soulyyy/TheWorldNews.git

Conflicts:
	src/main/java/theworldnews/database/news/objects/ArticleResponse.java
	src/main/java/theworldnews/handlers/news/servlets/EditDisplayController.java