Fixed branch aliases
Merge branch 'master' into 2.1
Fixing PHPDoc in ValueConverter class.
Moving from postRemove to preRemove since Entity ID needs to be read for deleting.
Merge branch 'master' of github.com:tPl0ch/TPSolariumExtensionsBundle into 2.1
Fixing failing test case for preRemove callback.
Merge branch 'master' into 2.1