Updated BaseModelCompanionDirector to no longer extend deprecated BaseCompanionDirector
Updates for O-pal API changes
Updates for php-code-templates syntax changes
Updated persister companions to accept a DatabaseConnection instance as a constructor arg instead of using PdoWrapper
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/companion/persister.tmpl.php
	src/companion/validator.tmpl.php