Merge branch '0.2'

Conflicts:
	CHANGELOG.md
	Security/Core/User/EntityUserProvider.php
	Security/Core/User/FOSUBUserProvider.php