Merge origin/master

Conflicts:
	include/DBconnection.inc.php
	include/basicVars.inc.php
	include/db_functions.inc.php
	include/utility.php
Merge origin/master

Conflicts:
	include/DBconnection.inc.php
	include/basicVars.inc.php
	include/db_functions.inc.php
	include/utility.php
Merge origin/master

Conflicts:
	include/DBconnection.inc.php
	include/basicVars.inc.php
	include/db_functions.inc.php
	include/utility.php
Merge origin/master

Conflicts:
	include/DBconnection.inc.php
	include/basicVars.inc.php
	include/db_functions.inc.php
	include/utility.php