Dia modif

add methods in UML diagram
Merge branch 'master' of github.com:Daisuki91/projetpoo2014

Conflicts:
	src/ebay/auction/Auction.java
	src/ebay/user/User.java