Merge origin/master

Conflicts:
	login.php
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	login.php
Merge origin/master
Merge origin/master

Conflicts:
	login.php
Merge origin/master
Merge origin/master

Conflicts:
	login.php
Merge origin/master

Conflicts:
	login.php
Merge origin/master

Conflicts:
	SysteemAdmin/AdminTicketAanmaken.php
Merge origin/master

Conflicts:
	SysteemAdmin/AdminTicketAanmaken.php
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	SysteemAdmin/AdminTicketAanmaken.php
Merge origin/master

Conflicts:
	SysteemAdmin/AdminTicketAanmaken.php
Merge origin/master