Improvements
Fixing conflicts and merge.
Improved symfony security dependency
Fix conflicts.