- upgrade to symfony 2.3
Merge remote-tracking branch 'origin' into develop