updated many files, more work to do
i am supposed to commit on this merge and i do not know why

Merge branch 'master' of https://github.com/MESD/PresentationBundle