Merge branch 'master' of git://github.com/php-pike/pike

Conflicts:
	src/Pike/DataTable/DataSource/Doctrine.php