Big update - Jason Koolman
Merge branch 'master' of https://github.com/YassirDriuch/Accent

Conflicts:
	src/com/appspot/AccentNijkerk/controller/LoginServlet.java