Update doc

update the pptx and the uml
Merge branch 'master' of github.com:Daisuki91/projetpoo2014

Conflicts:
	doc/uml.dia