Test branch - Second Commit
Merge master into JPABranch

Conflicts:
	src/main/java/com/partyplanner/controller/RegisterUserServlet.java