Merge origin/master

Conflicts:
	src/java/Servlets/ConfirmEditPostServlet.java
Merge origin/master