library entity
Merge branch 'master' of github.com:eddyghabachisae/SMB215-2014-Projet-Librairie

Conflicts:
	MVC/nbproject/private/private.properties
	MVC/nbproject/project.properties
library