Merge pull request #3 from garzgul/master

mise a jour lundi 08/09
08092014 - 14h55
08092014 - 14h55
Merge origin/master
Merge pull request #4 from garzgul/Gael

Merge pull request #3 from garzgul/master
Merge branch 'master' into Eddy

Conflicts:
	src/java/DAO/livre/AuteurDAO.java