Added MySQL integration (ask for mysql-config.php)
Merge commit '52ad113d413df5af27bf9982b7147d092d4587b7'

Conflicts:
	website/submit.php