Merge origin/master

Conflicts:
	src/justfeed/GUI/AanmaaknieuweTakeaway.java
Merge origin/master

Conflicts:
	src/justfeed/GUI/AanmaaknieuweTakeaway.java
Merge origin/master

Conflicts:
	src/justfeed/GUI/AanmaaknieuweTakeaway.java
Merge origin/master

Conflicts:
	src/justfeed/GUI/AanmaaknieuweTakeaway.java
Merge origin/master

Conflicts:
	src/justfeed/GUI/AanmaaknieuweTakeaway.java
Merge origin/master

Conflicts:
	src/justfeed/GUI/Login.form
	src/justfeed/GUI/Login.java
	src/justfeed/GUI/Loginadministrator.java
	src/justfeed/GUI/Registratie.form
	src/justfeed/GUI/Registratie.java