change of the hotfix
new merge with the hotfix
added the Prezi presentation
added PPT presentation and reorganized the files
deleted useless files
test branches