fix copyrights and things
Merge commit '3399655cd347eeaae9983a3d713c77f96b60a1b1' into rock/doctrine-bundle