database define

database define
Merge branch 'master' of https://github.com/MadsWesti/MDWD

Conflicts:
	system/functions.php