Test merging two repos
Merge branch 'master' of github-initconnection:initconnection/CMS

Conflicts:
	includes/database.class.php