Some compatibility changes towards Symfony 2.3
Merge branch 'master' of git://github.com/hansallis/IoFormBundle

Conflicts:
	Form/Extension/Type/EntityIdType.php