Merge branch 'develop'
added conditions
Merge branch 'master' of git://github.com/sulu-cmf/SuluSecurityBundle
Merge branch 'develop'
updated composer