QB revert

Så starter vi forfra, boys
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/model/user/AuthenticateUser.java