Merge and little cleanup
Merge branch 'master' of https://github.com/Soulyyy/TheWorldNews.git

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