Extends PDO functionality instead of composition
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/database/database.php
Remove unused attributes & methods