Slight edits
Merge origin/master

Conflicts:
	pom.xml
	src/main/java/theworldnews/database/users/queries/EditQueries.java
	src/main/java/theworldnews/handlers/news/servlets/DisplayController.java
	src/main/java/theworldnews/handlers/news/servlets/PreviewController.java
	src/main/java/theworldnews/handlers/news/servlets/SubmitController.java
	src/main/java/theworldnews/handlers/users/servlets/LoginController.java
	src/main/java/theworldnews/handlers/users/servlets/SignupController.java