trying to fix db setup with travis - part 7
Merge branch 'travis' of https://github.com/RedChrome/Chrome-PHP into travis

Conflicts:
	include/lib/core/database/Adapter/mysql.php
	include/lib/core/database/Adapter/mysql_.php
	include/lib/core/database/mysql.php