Mysql changes
Merge branch 'lDucks' of https://github.com/lDucks/TIPS into lDucks-lDucks

Conflicts:
	mysqlconnect.php