modified some stuff
another merge
Merge branch 'master' of https://github.com/MESD/PresentationBundle