cleaned code
Merge branch 'feature/media-manager' into develop
updated to symfony 2.5
Merge branch 'develop' of git://github.com/sulu-cmf/SuluMediaBundle into develop
Merge branch 'develop' of git://github.com/sulu-cmf/SuluMediaBundle into feature/media-ui