Merge branch 'master' of https://github.com/DarkCthulhu/php-PDO-Base

Conflicts:
	database.base.php
	database.php