6-6 spam+submit
Fixing Joyce's git
Fixed issues with the merge, swapped emaillogin an pwlogin in login.jsp
Category get method for specific post made
Fixing ferication
Merge branch 'Sophie' into Jeroen
Merge branch 'Joyce' into Jeroen

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/formHandlers/CategoryChecker.java
Merge branch 'Bas' into Jeroen
Major rebase