copying in constructor from ORM
removed constructor
moved constructor around
entity no longer care about database driver
Merge branch 'php5.4'