Updated servlets to simpler format
Fixed account signup
Merge origin/master

Conflicts:
	src/main/java/theworldnews/database/users/queries/EditQueries.java