Merge branch 'hotfix/1.1.5' into develop
Merge branch 'upstream/master' into develop
Changed compatible Symfony2 version to 2.1
Merge branch 'release/1.1.6'
Merge pull request #2 from Krypthonite/master

Make symbox support Symfony2 version 2.1 and 2.2