Added some more features
Merge branch '2.2' of ssh://github.com/codingfogey/symfony-standard.git into 2.2