Test2 merge
Merge branch 'Petru' into Nik

Conflicts:
	htdocs/cabbing/query - Server.php