Merge branch 'hotfix/1.1.5' into develop
Merge pull request #1 from Krypthonite/master

Enhance phpmyadmin vhost
Merge branch 'upstream/master' into develop
Changed compatible Symfony2 version to 2.1
Merge branch 'release/1.1.6'